diff options
| -rw-r--r-- | include/oox/crypto/Standard2007Engine.hxx | 5 | ||||
| -rw-r--r-- | oox/source/crypto/DocumentDecryption.cxx | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 37ae0a08f563..329d790a69cf 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -37,7 +37,10 @@ const sal_uInt32 ENCRYPT_PROVIDER_TYPE_AES = 0x00000018; const sal_uInt32 ENCRYPT_PROVIDER_TYPE_RC4 = 0x00000001; // version of encryption info used in MS Office 2007 (major = 3, minor = 2) -const sal_uInt32 VERSION_INFO_2007_FORMAT = 0x00020003; +const sal_uInt32 VERSION_INFO_2007_FORMAT = 0x00020003; +// version of encryption info used in MS Office 2007 SP2 and older (major = 4, minor = 2) +const sal_uInt32 VERSION_INFO_2007_FORMAT_SP2 = 0x00020004; + // version of encryption info - agile (major = 4, minor = 4) const sal_uInt32 VERSION_INFO_AGILE = 0x00040004; diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index b78842955cc4..c0cf3b17ead0 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -345,6 +345,7 @@ bool DocumentDecryption::readEncryptionInfo() switch (aVersion) { case VERSION_INFO_2007_FORMAT: + case VERSION_INFO_2007_FORMAT_SP2: mCryptoType = STANDARD_2007; // Set encryption info format bResult = readStandard2007EncryptionInfo( aBinaryInputStream ); break; |