]> source.dussan.org Git - poi.git/commitdiff
moved oxxml resources to module
authorCédric Walter <cedricwalter@apache.org>
Wed, 2 Apr 2014 07:15:48 +0000 (07:15 +0000)
committerCédric Walter <cedricwalter@apache.org>
Wed, 2 Apr 2014 07:15:48 +0000 (07:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/maven@1583904 13f79535-47bb-0310-9956-ffa450edef68

12 files changed:
poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd [new file with mode: 0644]
poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig [new file with mode: 0644]
poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd [new file with mode: 0644]
poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig [new file with mode: 0644]
poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd [new file with mode: 0644]
poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig [new file with mode: 0644]
src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd [deleted file]
src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig [deleted file]
src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd [deleted file]
src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig [deleted file]
src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd [deleted file]
src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig [deleted file]

diff --git a/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd b/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
new file mode 100644 (file)
index 0000000..7423c85
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--\r
+   ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+   ====================================================================\r
+-->\r
+<xs:schema xmlns="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:e="http://schemas.microsoft.com/office/2006/encryption" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
+       <xs:import namespace="http://schemas.microsoft.com/office/2006/encryption" schemaLocation="encryptionInfo.xsd"/>\r
+       <xs:simpleType name="ST_PasswordKeyEncryptorUri">\r
+               <xs:restriction base="xs:token">\r
+                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:complexType name="CT_CertificateKeyEncryptor">\r
+               <xs:attribute name="encryptedKeyValue" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted form of the intermediate key, which is encrypted with the public key contained within the X509Certificate attribute.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="X509Certificate" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded value that specifies a DER-encoded X.509 certificate (1) used to encrypt the intermediate key. The certificate (1) MUST contain only the public portion of the public-private key pair.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="certVerifier" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the HMAC of the binary data obtained by base64-decoding the X509Certificate attribute. The hashing algorithm used to derive the HMAC MUST be the hashing algorithm specified for the Encryption.keyData element. The secret key used to derive the HMAC MUST be the intermediate key. If the intermediate key is reset, any CertificateKeyEncryptor elements are also reset to contain the new intermediate key, except that the certVerifier attribute MUST match the value calculated using the current intermediate key, to verify that the CertificateKeyEncryptor element actually encrypted the current intermediate key. If a CertificateKeyEncryptor element does not have a correct certVerifier attribute, it MUST be discarded.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+       </xs:complexType>\r
+       <xs:element name="encryptedKey" type="CT_CertificateKeyEncryptor"/>\r
+</xs:schema>\r
diff --git a/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig b/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
new file mode 100644 (file)
index 0000000..73a27fa
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+   ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+   ====================================================================\r
+-->\r
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate">\r
+\r
+<xb:qname name="c:encryptedKey" javaname="EncryptedCertificateKey"/>\r
+  \r
+</xb:config>
\ No newline at end of file
diff --git a/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd b/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd
new file mode 100644 (file)
index 0000000..5b08560
--- /dev/null
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--\r
+   ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+   ====================================================================\r
+-->\r
+<xs:schema xmlns="http://schemas.microsoft.com/office/2006/encryption" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/encryption" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
+       <xs:import namespace="http://schemas.microsoft.com/office/2006/keyEncryptor/password" schemaLocation="encryptionPassword.xsd"/>\r
+       <xs:import namespace="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" schemaLocation="encryptionCertificate.xsd"/>\r
+       <xs:simpleType name="ST_SaltSize">\r
+               <xs:annotation>\r
+                       <xs:documentation>An unsigned integer that specifies the number of bytes used by a salt. It MUST be at least 1 and no greater than 65,536.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:unsignedInt">\r
+                       <xs:minInclusive value="1"/>\r
+                       <xs:maxInclusive value="65536"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_BlockSize">\r
+               <xs:annotation>\r
+                       <xs:documentation>An unsigned integer that specifies the number of bytes used to encrypt one block of data. It MUST be at least 2, no greater than 4096, and a multiple of 2.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:unsignedInt">\r
+                       <xs:minInclusive value="2"/>\r
+                       <xs:maxInclusive value="4096"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_KeyBits">\r
+               <xs:annotation>\r
+                       <xs:documentation>An unsigned integer that specifies the number of bits used by an encryption algorithm. It MUST be at least 8 and a multiple of 8.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:unsignedInt">\r
+                       <xs:minInclusive value="8"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_HashSize">\r
+               <xs:annotation>\r
+                       <xs:documentation>An unsigned integer that specifies the number of bytes used by a hash value. It MUST be at least 1, no greater than 65,536, and the same number of bytes as the hash algorithm emits.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:unsignedInt">\r
+                       <xs:minInclusive value="1"/>\r
+                       <xs:maxInclusive value="65536"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_SpinCount">\r
+               <xs:annotation>\r
+                       <xs:documentation>An unsigned integer that specifies the number of times to iterate on a hash of a password. It MUST NOT be greater than 10,000,000.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:unsignedInt">\r
+                       <xs:minInclusive value="0"/>\r
+                       <xs:maxInclusive value="10000000"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_CipherAlgorithm">\r
+               <xs:annotation>\r
+                       <xs:appinfo>modified for poi - list is restricted to given list in [ms-offcrypto]</xs:appinfo>\r
+                       <xs:documentation>A string that specifies the cipher algorithm. Values that are not defined MAY be used, and a compliant implementation is not required to support all defined values. Any algorithm that can be resolved by name by the underlying operating system can be used for hashing or encryption. Only block algorithms are supported for encryption. AES-128 is the default encryption algorithm, and SHA-1 is the default hashing algorithm if no other algorithms have been configured.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:token">\r
+                       <xs:enumeration value="AES">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the AES algorithm.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="RC2">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC2268] (http://tools.ietf.org/html/rfc2268). The use of RC2 is not recommended. If RC2 is used with a key length of less than 128 bits, documents could interoperate incorrectly across different versions of Windows.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="RC4">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST NOT be used.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="DES">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the DES algorithm. The use of DES is not recommended. If DES is used, the key length specified in the KeyBits element is required to be set to 64 for 56-bit encryption, and the key decrypted from encryptedKeyValue of KeyEncryptor is required to include the DES parity bits.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="DESX">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the algorithm as specified in [DRAFT-DESX] (http://tools.ietf.org/html/draft-ietf-ipsec-ciph-desx-00). The use of DESX is not recommended. If DESX is used, documents could interoperate incorrectly across different versions of Windows.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="3DES">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC1851] (http://tools.ietf.org/html/rfc1851). If 3DES or 3DES_112 is used, the key length specified in the KeyBits element is required to be set to 192 for 168-bit encryption and 128 for 112-bit encryption, and the key decrypted from encryptedKeyValue of KeyEncryptor is required to include the DES parity bits.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="3DES_112">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>see 3DES</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_CipherChaining">\r
+               <xs:annotation>\r
+                       <xs:documentation>A string that specifies the chaining mode used by CipherAlgorithm. For more details about chaining modes, see [BCMO800-38A] (http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf).</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:token">\r
+                       <xs:enumeration value="ChainingModeCBC">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>block chaining (CBC)</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="ChainingModeCFB">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>Cipher feedback chaining (CFB), with an 8-bit window</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:simpleType name="ST_HashAlgorithm">\r
+               <xs:annotation>\r
+                       <xs:appinfo>modified for poi - list is restricted to given list in [ms-offcrypto]</xs:appinfo>\r
+                       <xs:documentation>A string specifying a hashing algorithm. Values that are not defined MAY be used, and a compliant implementation is not required to support all defined values.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:restriction base="xs:token">\r
+                       <xs:enumeration value="SHA1">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC4634] (http://tools.ietf.org/html/rfc4634).</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="SHA256">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>see SHA1</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="SHA384">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>see SHA1</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="SHA512">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>see SHA1</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="MD5">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to MD5.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="MD4">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC1320] (http://tools.ietf.org/html/rfc1320).</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="MD2">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC1319] (http://tools.ietf.org/html/rfc1319).</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="RIPEMD-128">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>MUST conform to the hash functions specified in [ISO/IEC 10118]. (https://en.wikipedia.org/wiki/RIPEMD)</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="RIPEMD-160">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>see RIPEMD-128 (https://en.wikipedia.org/wiki/RIPEMD)</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+                       <xs:enumeration value="WHIRLPOOL">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>see RIPEMD-128 (https://en.wikipedia.org/wiki/ISO/IEC_10118-3)</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:enumeration>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:complexType name="CT_KeyData">\r
+               <xs:annotation>\r
+                       <xs:documentation>A complex type that specifies the encryption used within this element. The saltValue attribute is a base64-encoded binary value that is randomly generated. The number of bytes required to decode the saltValue attribute MUST be equal to the value of the saltSize attribute.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:attribute name="saltSize" type="ST_SaltSize" use="required"/>\r
+               <xs:attribute name="blockSize" type="ST_BlockSize" use="required"/>\r
+               <xs:attribute name="keyBits" type="ST_KeyBits" use="required"/>\r
+               <xs:attribute name="hashSize" type="ST_HashSize" use="required"/>\r
+               <xs:attribute name="cipherAlgorithm" type="ST_CipherAlgorithm" use="required"/>\r
+               <xs:attribute name="cipherChaining" type="ST_CipherChaining" use="required"/>\r
+               <xs:attribute name="hashAlgorithm" type="ST_HashAlgorithm" use="required"/>\r
+               <xs:attribute name="saltValue" type="xs:base64Binary" use="required"/>\r
+       </xs:complexType>\r
+       <xs:complexType name="CT_DataIntegrity">\r
+               <xs:annotation>\r
+                       <xs:documentation>A complex type that specifies data used to verify whether the encrypted data passes an integrity check. It MUST be generated using the method specified in section 2.3.4.14 (http://msdn.microsoft.com/en-us/library/dd924068(v=office.12).aspx).</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:attribute name="encryptedHmacKey" type="xs:base64Binary" use="required">\r
+                       <xs:annotation>\r
+                               <xs:documentation>A base64-encoded value that specifies an encrypted key used in calculating the encryptedHmacValue.</xs:documentation>\r
+                       </xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="encryptedHmacValue" type="xs:base64Binary" use="required">\r
+                       <xs:annotation>\r
+                               <xs:documentation>A base64-encoded value that specifies an HMAC derived from encryptedHmacKey and the encrypted data.</xs:documentation>\r
+                       </xs:annotation>\r
+               </xs:attribute>\r
+       </xs:complexType>\r
+       <xs:complexType name="CT_KeyEncryptor">\r
+               <xs:annotation>\r
+                       <xs:appinfo>modified for POI</xs:appinfo>\r
+                       <xs:documentation>A complex type that specifies the parameters used to encrypt an intermediate key, which is used to perform the final encryption of the document. To ensure extensibility, arbitrary elements can be defined to encrypt the intermediate key. The intermediate key MUST be the same for all KeyEncryptor elements.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:choice>\r
+                       <xs:element ref="p:encryptedKey"/>\r
+                       <xs:element ref="c:encryptedKey"/>\r
+               </xs:choice>\r
+               <xs:attribute name="uri">\r
+                       <xs:annotation>\r
+                               <xs:appinfo>modified for POI</xs:appinfo>\r
+                       </xs:annotation>\r
+                       <xs:simpleType>\r
+                               <xs:restriction base="xs:token">\r
+                                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/password"/>\r
+                                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate"/>\r
+                               </xs:restriction>\r
+                       </xs:simpleType>\r
+               </xs:attribute>\r
+       </xs:complexType>\r
+       <xs:complexType name="CT_KeyEncryptors">\r
+               <xs:annotation>\r
+                       <xs:documentation>A sequence of KeyEncryptor elements. Exactly one KeyEncryptors element MUST be present, and the KeyEncryptors element MUST contain at least one KeyEncryptor.</xs:documentation>\r
+               </xs:annotation>\r
+               <xs:sequence>\r
+                       <xs:element name="keyEncryptor" type="CT_KeyEncryptor" maxOccurs="unbounded"/>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+       <xs:complexType name="CT_Encryption">\r
+               <xs:sequence>\r
+                       <xs:element name="keyData" type="CT_KeyData"/>\r
+                       <xs:element name="dataIntegrity" type="CT_DataIntegrity">\r
+                               <xs:annotation>\r
+                                       <xs:appinfo>modified for POI</xs:appinfo>\r
+                                       <xs:documentation>All ECMA-376 documents [ECMA-376] encrypted by Microsoft Office using agile encryption will have a DataIntegrity element present. The schema allows for a DataIntegrity element to not be present because the encryption schema can be used by applications that do not create ECMA-376 documents [ECMA-376].</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:element>\r
+                       <xs:element name="keyEncryptors" type="CT_KeyEncryptors">\r
+                               <xs:annotation>\r
+                                       <xs:documentation>The KeyEncryptor element, which MUST be used when encrypting password-protected agile encryption documents, is either a PasswordKeyEncryptor or a CertificateKeyEncryptor. Exactly one PasswordKeyEncryptor MUST be present. Zero or more CertificateKeyEncryptor elements are contained within the KeyEncryptors element.</xs:documentation>\r
+                               </xs:annotation>\r
+                       </xs:element>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+       <xs:element name="encryption" type="CT_Encryption"/>\r
+</xs:schema>\r
diff --git a/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig b/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
new file mode 100644 (file)
index 0000000..c9474a0
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+   ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+   ====================================================================\r
+-->\r
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password">\r
+\r
+<xb:qname name="c:encryptedKey" javaname="EncryptedCertificateKey"/>\r
+<xb:qname name="p:encryptedKey" javaname="EncryptedPasswordKey"/>\r
+  \r
+</xb:config>
\ No newline at end of file
diff --git a/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd b/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd
new file mode 100644 (file)
index 0000000..79ae888
--- /dev/null
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--\r
+   ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+   ====================================================================\r
+-->\r
+<xs:schema xmlns="http://schemas.microsoft.com/office/2006/keyEncryptor/password" xmlns:e="http://schemas.microsoft.com/office/2006/encryption" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/keyEncryptor/password" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
+       <xs:import namespace="http://schemas.microsoft.com/office/2006/encryption" schemaLocation="encryptionInfo.xsd"/>\r
+       <xs:simpleType name="ST_PasswordKeyEncryptorUri">\r
+               <xs:restriction base="xs:token">\r
+                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/password"/>\r
+               </xs:restriction>\r
+       </xs:simpleType>\r
+       <xs:complexType name="CT_PasswordKeyEncryptor">\r
+               <xs:attribute name="saltSize" type="e:ST_SaltSize" use="required">\r
+                       <xs:annotation><xs:documentation>A SaltSize that specifies the size of the salt for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="blockSize" type="e:ST_BlockSize" use="required">\r
+                       <xs:annotation><xs:documentation>A BlockSize that specifies the block size for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="keyBits" type="e:ST_KeyBits" use="required">\r
+                       <xs:annotation><xs:documentation>A KeyBits that specifies the number of bits for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="hashSize" type="e:ST_HashSize" use="required">\r
+                       <xs:annotation><xs:documentation>A HashSize that specifies the size of the binary form of the hash for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="cipherAlgorithm" type="e:ST_CipherAlgorithm" use="required">\r
+                       <xs:annotation><xs:documentation>A CipherAlgorithm that specifies the cipher algorithm for a PasswordKeyEncryptor. The cipher algorithm specified MUST be the same as the cipher algorithm specified for the Encryption.keyData element.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="cipherChaining" type="e:ST_CipherChaining" use="required">\r
+                       <xs:annotation><xs:documentation>A CipherChaining that specifies the cipher chaining mode for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="hashAlgorithm" type="e:ST_HashAlgorithm" use="required">\r
+                       <xs:annotation><xs:documentation>A HashAlgorithm that specifies the hashing algorithm for a PasswordKeyEncryptor. The hashing algorithm specified MUST be the same as the hashing algorithm specified for the Encryption.keyData element.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="saltValue" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded binary byte array that specifies the salt value for a PasswordKeyEncryptor. The number of bytes required by the decoded form of this element MUST be saltSize.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="spinCount" type="e:ST_SpinCount" use="required">\r
+                       <xs:annotation><xs:documentation>A SpinCount that specifies the spin count for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="encryptedVerifierHashInput" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted verifier hash input for a PasswordKeyEncryptor used in password verification.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="encryptedVerifierHashValue" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted verifier hash value for a PasswordKeyEncryptor used in password verification.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+               <xs:attribute name="encryptedKeyValue" type="xs:base64Binary" use="required">\r
+                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted form of the intermediate key.</xs:documentation></xs:annotation>\r
+               </xs:attribute>\r
+       </xs:complexType>\r
+       <xs:element name="encryptedKey" type="CT_PasswordKeyEncryptor"/>\r
+</xs:schema>\r
diff --git a/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig b/poi-ooxml/src/main/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
new file mode 100644 (file)
index 0000000..3a2bb2c
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+   ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+   ====================================================================\r
+-->\r
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password">\r
+\r
+<xb:qname name="p:encryptedKey" javaname="EncryptedPasswordKey"/>\r
+  \r
+</xb:config>
\ No newline at end of file
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd b/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
deleted file mode 100644 (file)
index 7423c85..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--\r
-   ====================================================================\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-   ====================================================================\r
--->\r
-<xs:schema xmlns="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:e="http://schemas.microsoft.com/office/2006/encryption" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
-       <xs:import namespace="http://schemas.microsoft.com/office/2006/encryption" schemaLocation="encryptionInfo.xsd"/>\r
-       <xs:simpleType name="ST_PasswordKeyEncryptorUri">\r
-               <xs:restriction base="xs:token">\r
-                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:complexType name="CT_CertificateKeyEncryptor">\r
-               <xs:attribute name="encryptedKeyValue" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted form of the intermediate key, which is encrypted with the public key contained within the X509Certificate attribute.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="X509Certificate" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded value that specifies a DER-encoded X.509 certificate (1) used to encrypt the intermediate key. The certificate (1) MUST contain only the public portion of the public-private key pair.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="certVerifier" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the HMAC of the binary data obtained by base64-decoding the X509Certificate attribute. The hashing algorithm used to derive the HMAC MUST be the hashing algorithm specified for the Encryption.keyData element. The secret key used to derive the HMAC MUST be the intermediate key. If the intermediate key is reset, any CertificateKeyEncryptor elements are also reset to contain the new intermediate key, except that the certVerifier attribute MUST match the value calculated using the current intermediate key, to verify that the CertificateKeyEncryptor element actually encrypted the current intermediate key. If a CertificateKeyEncryptor element does not have a correct certVerifier attribute, it MUST be discarded.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-       </xs:complexType>\r
-       <xs:element name="encryptedKey" type="CT_CertificateKeyEncryptor"/>\r
-</xs:schema>\r
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig b/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
deleted file mode 100644 (file)
index 73a27fa..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-   ====================================================================\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-   ====================================================================\r
--->\r
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate">\r
-\r
-<xb:qname name="c:encryptedKey" javaname="EncryptedCertificateKey"/>\r
-  \r
-</xb:config>
\ No newline at end of file
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd b/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd
deleted file mode 100644 (file)
index 5b08560..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--\r
-   ====================================================================\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-   ====================================================================\r
--->\r
-<xs:schema xmlns="http://schemas.microsoft.com/office/2006/encryption" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/encryption" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
-       <xs:import namespace="http://schemas.microsoft.com/office/2006/keyEncryptor/password" schemaLocation="encryptionPassword.xsd"/>\r
-       <xs:import namespace="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" schemaLocation="encryptionCertificate.xsd"/>\r
-       <xs:simpleType name="ST_SaltSize">\r
-               <xs:annotation>\r
-                       <xs:documentation>An unsigned integer that specifies the number of bytes used by a salt. It MUST be at least 1 and no greater than 65,536.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:unsignedInt">\r
-                       <xs:minInclusive value="1"/>\r
-                       <xs:maxInclusive value="65536"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_BlockSize">\r
-               <xs:annotation>\r
-                       <xs:documentation>An unsigned integer that specifies the number of bytes used to encrypt one block of data. It MUST be at least 2, no greater than 4096, and a multiple of 2.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:unsignedInt">\r
-                       <xs:minInclusive value="2"/>\r
-                       <xs:maxInclusive value="4096"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_KeyBits">\r
-               <xs:annotation>\r
-                       <xs:documentation>An unsigned integer that specifies the number of bits used by an encryption algorithm. It MUST be at least 8 and a multiple of 8.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:unsignedInt">\r
-                       <xs:minInclusive value="8"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_HashSize">\r
-               <xs:annotation>\r
-                       <xs:documentation>An unsigned integer that specifies the number of bytes used by a hash value. It MUST be at least 1, no greater than 65,536, and the same number of bytes as the hash algorithm emits.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:unsignedInt">\r
-                       <xs:minInclusive value="1"/>\r
-                       <xs:maxInclusive value="65536"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_SpinCount">\r
-               <xs:annotation>\r
-                       <xs:documentation>An unsigned integer that specifies the number of times to iterate on a hash of a password. It MUST NOT be greater than 10,000,000.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:unsignedInt">\r
-                       <xs:minInclusive value="0"/>\r
-                       <xs:maxInclusive value="10000000"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_CipherAlgorithm">\r
-               <xs:annotation>\r
-                       <xs:appinfo>modified for poi - list is restricted to given list in [ms-offcrypto]</xs:appinfo>\r
-                       <xs:documentation>A string that specifies the cipher algorithm. Values that are not defined MAY be used, and a compliant implementation is not required to support all defined values. Any algorithm that can be resolved by name by the underlying operating system can be used for hashing or encryption. Only block algorithms are supported for encryption. AES-128 is the default encryption algorithm, and SHA-1 is the default hashing algorithm if no other algorithms have been configured.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:token">\r
-                       <xs:enumeration value="AES">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the AES algorithm.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="RC2">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC2268] (http://tools.ietf.org/html/rfc2268). The use of RC2 is not recommended. If RC2 is used with a key length of less than 128 bits, documents could interoperate incorrectly across different versions of Windows.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="RC4">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST NOT be used.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="DES">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the DES algorithm. The use of DES is not recommended. If DES is used, the key length specified in the KeyBits element is required to be set to 64 for 56-bit encryption, and the key decrypted from encryptedKeyValue of KeyEncryptor is required to include the DES parity bits.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="DESX">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the algorithm as specified in [DRAFT-DESX] (http://tools.ietf.org/html/draft-ietf-ipsec-ciph-desx-00). The use of DESX is not recommended. If DESX is used, documents could interoperate incorrectly across different versions of Windows.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="3DES">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC1851] (http://tools.ietf.org/html/rfc1851). If 3DES or 3DES_112 is used, the key length specified in the KeyBits element is required to be set to 192 for 168-bit encryption and 128 for 112-bit encryption, and the key decrypted from encryptedKeyValue of KeyEncryptor is required to include the DES parity bits.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="3DES_112">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>see 3DES</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_CipherChaining">\r
-               <xs:annotation>\r
-                       <xs:documentation>A string that specifies the chaining mode used by CipherAlgorithm. For more details about chaining modes, see [BCMO800-38A] (http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf).</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:token">\r
-                       <xs:enumeration value="ChainingModeCBC">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>block chaining (CBC)</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="ChainingModeCFB">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>Cipher feedback chaining (CFB), with an 8-bit window</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:simpleType name="ST_HashAlgorithm">\r
-               <xs:annotation>\r
-                       <xs:appinfo>modified for poi - list is restricted to given list in [ms-offcrypto]</xs:appinfo>\r
-                       <xs:documentation>A string specifying a hashing algorithm. Values that are not defined MAY be used, and a compliant implementation is not required to support all defined values.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:restriction base="xs:token">\r
-                       <xs:enumeration value="SHA1">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC4634] (http://tools.ietf.org/html/rfc4634).</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="SHA256">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>see SHA1</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="SHA384">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>see SHA1</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="SHA512">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>see SHA1</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="MD5">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to MD5.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="MD4">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC1320] (http://tools.ietf.org/html/rfc1320).</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="MD2">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the algorithm as specified in [RFC1319] (http://tools.ietf.org/html/rfc1319).</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="RIPEMD-128">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>MUST conform to the hash functions specified in [ISO/IEC 10118]. (https://en.wikipedia.org/wiki/RIPEMD)</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="RIPEMD-160">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>see RIPEMD-128 (https://en.wikipedia.org/wiki/RIPEMD)</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-                       <xs:enumeration value="WHIRLPOOL">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>see RIPEMD-128 (https://en.wikipedia.org/wiki/ISO/IEC_10118-3)</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:enumeration>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:complexType name="CT_KeyData">\r
-               <xs:annotation>\r
-                       <xs:documentation>A complex type that specifies the encryption used within this element. The saltValue attribute is a base64-encoded binary value that is randomly generated. The number of bytes required to decode the saltValue attribute MUST be equal to the value of the saltSize attribute.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:attribute name="saltSize" type="ST_SaltSize" use="required"/>\r
-               <xs:attribute name="blockSize" type="ST_BlockSize" use="required"/>\r
-               <xs:attribute name="keyBits" type="ST_KeyBits" use="required"/>\r
-               <xs:attribute name="hashSize" type="ST_HashSize" use="required"/>\r
-               <xs:attribute name="cipherAlgorithm" type="ST_CipherAlgorithm" use="required"/>\r
-               <xs:attribute name="cipherChaining" type="ST_CipherChaining" use="required"/>\r
-               <xs:attribute name="hashAlgorithm" type="ST_HashAlgorithm" use="required"/>\r
-               <xs:attribute name="saltValue" type="xs:base64Binary" use="required"/>\r
-       </xs:complexType>\r
-       <xs:complexType name="CT_DataIntegrity">\r
-               <xs:annotation>\r
-                       <xs:documentation>A complex type that specifies data used to verify whether the encrypted data passes an integrity check. It MUST be generated using the method specified in section 2.3.4.14 (http://msdn.microsoft.com/en-us/library/dd924068(v=office.12).aspx).</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:attribute name="encryptedHmacKey" type="xs:base64Binary" use="required">\r
-                       <xs:annotation>\r
-                               <xs:documentation>A base64-encoded value that specifies an encrypted key used in calculating the encryptedHmacValue.</xs:documentation>\r
-                       </xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="encryptedHmacValue" type="xs:base64Binary" use="required">\r
-                       <xs:annotation>\r
-                               <xs:documentation>A base64-encoded value that specifies an HMAC derived from encryptedHmacKey and the encrypted data.</xs:documentation>\r
-                       </xs:annotation>\r
-               </xs:attribute>\r
-       </xs:complexType>\r
-       <xs:complexType name="CT_KeyEncryptor">\r
-               <xs:annotation>\r
-                       <xs:appinfo>modified for POI</xs:appinfo>\r
-                       <xs:documentation>A complex type that specifies the parameters used to encrypt an intermediate key, which is used to perform the final encryption of the document. To ensure extensibility, arbitrary elements can be defined to encrypt the intermediate key. The intermediate key MUST be the same for all KeyEncryptor elements.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:choice>\r
-                       <xs:element ref="p:encryptedKey"/>\r
-                       <xs:element ref="c:encryptedKey"/>\r
-               </xs:choice>\r
-               <xs:attribute name="uri">\r
-                       <xs:annotation>\r
-                               <xs:appinfo>modified for POI</xs:appinfo>\r
-                       </xs:annotation>\r
-                       <xs:simpleType>\r
-                               <xs:restriction base="xs:token">\r
-                                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/password"/>\r
-                                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate"/>\r
-                               </xs:restriction>\r
-                       </xs:simpleType>\r
-               </xs:attribute>\r
-       </xs:complexType>\r
-       <xs:complexType name="CT_KeyEncryptors">\r
-               <xs:annotation>\r
-                       <xs:documentation>A sequence of KeyEncryptor elements. Exactly one KeyEncryptors element MUST be present, and the KeyEncryptors element MUST contain at least one KeyEncryptor.</xs:documentation>\r
-               </xs:annotation>\r
-               <xs:sequence>\r
-                       <xs:element name="keyEncryptor" type="CT_KeyEncryptor" maxOccurs="unbounded"/>\r
-               </xs:sequence>\r
-       </xs:complexType>\r
-       <xs:complexType name="CT_Encryption">\r
-               <xs:sequence>\r
-                       <xs:element name="keyData" type="CT_KeyData"/>\r
-                       <xs:element name="dataIntegrity" type="CT_DataIntegrity">\r
-                               <xs:annotation>\r
-                                       <xs:appinfo>modified for POI</xs:appinfo>\r
-                                       <xs:documentation>All ECMA-376 documents [ECMA-376] encrypted by Microsoft Office using agile encryption will have a DataIntegrity element present. The schema allows for a DataIntegrity element to not be present because the encryption schema can be used by applications that do not create ECMA-376 documents [ECMA-376].</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:element>\r
-                       <xs:element name="keyEncryptors" type="CT_KeyEncryptors">\r
-                               <xs:annotation>\r
-                                       <xs:documentation>The KeyEncryptor element, which MUST be used when encrypting password-protected agile encryption documents, is either a PasswordKeyEncryptor or a CertificateKeyEncryptor. Exactly one PasswordKeyEncryptor MUST be present. Zero or more CertificateKeyEncryptor elements are contained within the KeyEncryptors element.</xs:documentation>\r
-                               </xs:annotation>\r
-                       </xs:element>\r
-               </xs:sequence>\r
-       </xs:complexType>\r
-       <xs:element name="encryption" type="CT_Encryption"/>\r
-</xs:schema>\r
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig b/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
deleted file mode 100644 (file)
index c9474a0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-   ====================================================================\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-   ====================================================================\r
--->\r
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:c="http://schemas.microsoft.com/office/2006/keyEncryptor/certificate" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password">\r
-\r
-<xb:qname name="c:encryptedKey" javaname="EncryptedCertificateKey"/>\r
-<xb:qname name="p:encryptedKey" javaname="EncryptedPasswordKey"/>\r
-  \r
-</xb:config>
\ No newline at end of file
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd b/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd
deleted file mode 100644 (file)
index 79ae888..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!--\r
-   ====================================================================\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-   ====================================================================\r
--->\r
-<xs:schema xmlns="http://schemas.microsoft.com/office/2006/keyEncryptor/password" xmlns:e="http://schemas.microsoft.com/office/2006/encryption" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.microsoft.com/office/2006/keyEncryptor/password" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
-       <xs:import namespace="http://schemas.microsoft.com/office/2006/encryption" schemaLocation="encryptionInfo.xsd"/>\r
-       <xs:simpleType name="ST_PasswordKeyEncryptorUri">\r
-               <xs:restriction base="xs:token">\r
-                       <xs:enumeration value="http://schemas.microsoft.com/office/2006/keyEncryptor/password"/>\r
-               </xs:restriction>\r
-       </xs:simpleType>\r
-       <xs:complexType name="CT_PasswordKeyEncryptor">\r
-               <xs:attribute name="saltSize" type="e:ST_SaltSize" use="required">\r
-                       <xs:annotation><xs:documentation>A SaltSize that specifies the size of the salt for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="blockSize" type="e:ST_BlockSize" use="required">\r
-                       <xs:annotation><xs:documentation>A BlockSize that specifies the block size for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="keyBits" type="e:ST_KeyBits" use="required">\r
-                       <xs:annotation><xs:documentation>A KeyBits that specifies the number of bits for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="hashSize" type="e:ST_HashSize" use="required">\r
-                       <xs:annotation><xs:documentation>A HashSize that specifies the size of the binary form of the hash for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="cipherAlgorithm" type="e:ST_CipherAlgorithm" use="required">\r
-                       <xs:annotation><xs:documentation>A CipherAlgorithm that specifies the cipher algorithm for a PasswordKeyEncryptor. The cipher algorithm specified MUST be the same as the cipher algorithm specified for the Encryption.keyData element.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="cipherChaining" type="e:ST_CipherChaining" use="required">\r
-                       <xs:annotation><xs:documentation>A CipherChaining that specifies the cipher chaining mode for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="hashAlgorithm" type="e:ST_HashAlgorithm" use="required">\r
-                       <xs:annotation><xs:documentation>A HashAlgorithm that specifies the hashing algorithm for a PasswordKeyEncryptor. The hashing algorithm specified MUST be the same as the hashing algorithm specified for the Encryption.keyData element.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="saltValue" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded binary byte array that specifies the salt value for a PasswordKeyEncryptor. The number of bytes required by the decoded form of this element MUST be saltSize.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="spinCount" type="e:ST_SpinCount" use="required">\r
-                       <xs:annotation><xs:documentation>A SpinCount that specifies the spin count for a PasswordKeyEncryptor.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="encryptedVerifierHashInput" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted verifier hash input for a PasswordKeyEncryptor used in password verification.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="encryptedVerifierHashValue" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted verifier hash value for a PasswordKeyEncryptor used in password verification.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-               <xs:attribute name="encryptedKeyValue" type="xs:base64Binary" use="required">\r
-                       <xs:annotation><xs:documentation>A base64-encoded value that specifies the encrypted form of the intermediate key.</xs:documentation></xs:annotation>\r
-               </xs:attribute>\r
-       </xs:complexType>\r
-       <xs:element name="encryptedKey" type="CT_PasswordKeyEncryptor"/>\r
-</xs:schema>\r
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig b/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
deleted file mode 100644 (file)
index 3a2bb2c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-   ====================================================================\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-   ====================================================================\r
--->\r
-<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config" xmlns:p="http://schemas.microsoft.com/office/2006/keyEncryptor/password">\r
-\r
-<xb:qname name="p:encryptedKey" javaname="EncryptedPasswordKey"/>\r
-  \r
-</xb:config>
\ No newline at end of file