diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-23 14:13:24 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-23 14:13:24 +0100 |
| commit | 1decd7beffc8333d441b4327649685464e129d26 (patch) | |
| tree | b5ea5538ef1984c510bf2d4c51fdaa2d319d9e6f /package/inc/ZipPackageStream.hxx | |
| parent | b92dc6c03d0876230e3e7f2daa43a3350972f0e9 (diff) | |
mav60: #164341# fix problems with the new implementation
Diffstat (limited to 'package/inc/ZipPackageStream.hxx')
| -rw-r--r-- | package/inc/ZipPackageStream.hxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index 7d22bf71a86d..454ea735d0a0 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -64,6 +64,7 @@ protected: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aStorageEncryptionKeys; ::com::sun::star::uno::Sequence< sal_Int8 > m_aEncryptionKey; + sal_Int32 m_nImportedStartKeyAlgorithm; sal_Int32 m_nImportedEncryptionAlgorithm; sal_Int32 m_nImportedChecksumAlgorithm; sal_Int32 m_nImportedDerivedKeySize; @@ -80,7 +81,7 @@ protected: bool m_bUseWinEncoding; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& GetOwnSeekStream(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetOwnSeekStream(); public: sal_Bool HasOwnKey () const { return bHaveOwnKey;} @@ -99,11 +100,11 @@ public: sal_Int32 GetKeyGenID(); - const com::sun::star::uno::Sequence < sal_Int8 >& getInitialisationVector () const + const com::sun::star::uno::Sequence < sal_Int8 > getInitialisationVector () const { return m_xBaseEncryptionData->m_aInitVector;} - const com::sun::star::uno::Sequence < sal_Int8 >& getDigest () const + const com::sun::star::uno::Sequence < sal_Int8 > getDigest () const { return m_xBaseEncryptionData->m_aDigest;} - const com::sun::star::uno::Sequence < sal_Int8 >& getSalt () const + const com::sun::star::uno::Sequence < sal_Int8 > getSalt () const { return m_xBaseEncryptionData->m_aSalt;} sal_Int32 getIterationCount () const { return m_xBaseEncryptionData->m_nIterationCount;} @@ -113,9 +114,12 @@ public: sal_uInt8 GetStreamMode() const { return m_nStreamMode; } sal_uInt32 GetMagicalHackPos() const { return m_nMagicalHackPos; } sal_uInt32 GetMagicalHackSize() const { return m_nMagicalHackSize; } + sal_Int32 GetEncryptionAlgorithm() const; + sal_Int32 GetBlockSize() const; void SetToBeCompressed (sal_Bool bNewValue) { bToBeCompressed = bNewValue;} void SetIsEncrypted (sal_Bool bNewValue) { bIsEncrypted = bNewValue;} + void SetImportedStartKeyAlgorithm( sal_Int32 nAlgorithm ) { m_nImportedStartKeyAlgorithm = nAlgorithm; } void SetImportedEncryptionAlgorithm( sal_Int32 nAlgorithm ) { m_nImportedEncryptionAlgorithm = nAlgorithm; } void SetImportedChecksumAlgorithm( sal_Int32 nAlgorithm ) { m_nImportedChecksumAlgorithm = nAlgorithm; } void SetImportedDerivedKeySize( sal_Int32 nSize ) { m_nImportedDerivedKeySize = nSize; } |