ODFTOOLKIT-447 Encrypted documents invalid due to misordered manifest XML elements
git-svn-id: https://svn.apache.org/repos/asf/incubator/odf/trunk@1786677 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index da20204..394a60b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,7 +15,7 @@
* Apache Jena 2.11.2 (http://jena.apache.org/download/index.html)
* Apache Commons Validator 1.5.0 (http://commons.apache.org/proper/commons-validator//download_validator.cgi)
-For a full dependecy list run mvn dependency:tree from the top level in the source module or see the release wiki page.
+For a full dependency list run mvn dependency:tree from the top level in the source module or see the release wiki page.
Optimizations
-------------
@@ -57,6 +57,8 @@
* ODFTOOLKIT-425 Please delete old releases from mirroring system
* ODFTOOLKIT-433 Document.updateXMLIds(...) does not update referenced id's
* ODFTOOLKIT-442 Table.getRowIterator() out of sync without calling hasNext()
+* ODFTOOLKIT-446 Receiving encrypted file without password should be not NULL
+* ODFTOOLKIT-447 Encrypted documents invalid due to misordered manifest XML elements
The following people have contributed to ODF Toolkit 0.6.2 incubating by reporting or submitting on the issues resolved in this release:
@@ -107,7 +109,7 @@
* Apache Jena 2.9.4 (http://jena.apache.org/download/index.html)
* Apache Commons Validator 1.4.0 (http://commons.apache.org/proper/commons-validator//download_validator.cgi)
-For a full dependecy list run mvn dependency:tree from the top level in the source module or see the release wiki page.
+For a full dependency list run mvn dependency:tree from the top level in the source module or see the release wiki page.
Upgrading from 0.6-incubating
-----------------------------
@@ -204,7 +206,7 @@
* Apache Clerezza 0.1-incubating (http://incubator.apache.org/clerezza/downloads/)
* Apache Commons Validator 1.4.0 (http://commons.apache.org/proper/commons-validator//download_validator.cgi)
-For a full dependecy list run mvn dependency:tree from the top level in the source module or see the release wiki page.
+For a full dependency list run mvn dependency:tree from the top level in the source module or see the release wiki page.
Upgrading from 0.5-incubating
-----------------------------
diff --git a/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java b/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java
index 1c63492..ea45594 100644
--- a/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java
+++ b/validator/src/main/java/org/odftoolkit/odfvalidator/ODFPackageValidator.java
@@ -1,20 +1,20 @@
/************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
- *
+ *
* Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
- *
+ *
* Use is subject to license terms.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at http://www.apache.org/licenses/LICENSE-2.0. You can also
* obtain a copy of the License at http://odftoolkit.org/docs/license.txt
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*
@@ -38,7 +38,6 @@
import org.xml.sax.InputSource;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
-
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -88,11 +87,11 @@
return _validate(aLogger);
}
-
+
OdfVersion getOdfPackageVersion(){
return mOdfPackageVersion;
}
-
+
private boolean _validate(Logger aLogger) throws ODFValidatorException {
boolean bHasErrors = false;
@@ -362,7 +361,7 @@
if (aFileEntry != null) {
EncryptionDataElement aEncData = aFileEntry.getEncryptionData();
if (aEncData != null) {
- aLogger.logFatalError("stream content is encrypted. Validataion of encrypted content is not supported.");
+ aLogger.logFatalError("stream content is encrypted. Validation of encrypted content is not supported.");
return true;
}
}
