Kaydet (Commit) 15b3e298 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

fdo#76222 oox: add support for MSO 2007 SP2 encrypted documents

Change-Id: I8fa586d49437ff5422fc3daa4c81439146e598a0
üst 44956c32
......@@ -38,6 +38,9 @@ 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;
// 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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment