diff options
Diffstat (limited to 'package/inc')
-rw-r--r-- | package/inc/EncryptionData.hxx | 5 | ||||
-rw-r--r-- | package/inc/ZipPackageStream.hxx | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx index 0add43f143de..c7c6ffb3555e 100644 --- a/package/inc/EncryptionData.hxx +++ b/package/inc/EncryptionData.hxx @@ -50,14 +50,16 @@ public: sal_Int32 m_nCheckAlg; sal_Int32 m_nDerivedKeySize; sal_Int32 m_nStartKeyGenID; + bool m_bTryWrongSHA1; - EncryptionData( const BaseEncryptionData& aData, const css::uno::Sequence< sal_Int8 >& aKey, sal_Int32 nEncAlg, sal_Int32 nCheckAlg, sal_Int32 nDerivedKeySize, sal_Int32 nStartKeyGenID ) + EncryptionData(const BaseEncryptionData& aData, const css::uno::Sequence< sal_Int8 >& aKey, sal_Int32 nEncAlg, sal_Int32 nCheckAlg, sal_Int32 nDerivedKeySize, sal_Int32 nStartKeyGenID, bool const bTryWrongSHA1) : BaseEncryptionData( aData ) , m_aKey( aKey ) , m_nEncAlg( nEncAlg ) , m_nCheckAlg( nCheckAlg ) , m_nDerivedKeySize( nDerivedKeySize ) , m_nStartKeyGenID( nStartKeyGenID ) + , m_bTryWrongSHA1(bTryWrongSHA1) {} EncryptionData( const EncryptionData& aData ) @@ -67,6 +69,7 @@ public: , m_nCheckAlg( aData.m_nCheckAlg ) , m_nDerivedKeySize( aData.m_nDerivedKeySize ) , m_nStartKeyGenID( aData.m_nStartKeyGenID ) + , m_bTryWrongSHA1(aData.m_bTryWrongSHA1) {} }; diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index 4620b5da64f2..67428c086948 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -83,9 +83,10 @@ public: bool IsFromManifest() const { return m_bFromManifest; } void SetFromManifest( bool bValue ) { m_bFromManifest = bValue; } - ::rtl::Reference< EncryptionData > GetEncryptionData( bool bWinEncoding = false ); + enum class Bugs { None, WinEncodingWrongSHA1, WrongSHA1 }; + ::rtl::Reference<EncryptionData> GetEncryptionData(Bugs bugs = Bugs::WrongSHA1); - css::uno::Sequence< sal_Int8 > GetEncryptionKey( bool bWinEncoding = false ); + css::uno::Sequence<sal_Int8> GetEncryptionKey(Bugs bugs = Bugs::WrongSHA1); sal_Int32 GetStartKeyGenID(); |