diff options
| author | Martin Gallwey <mtg@openoffice.org> | 2001-09-24 17:27:53 +0000 |
|---|---|---|
| committer | Martin Gallwey <mtg@openoffice.org> | 2001-09-24 17:27:53 +0000 |
| commit | db128d3449a155e4870f2003b6e66712a0948428 (patch) | |
| tree | ba28c16c41a8d2b3d89c4d34d663b034c4e739a9 /package/source/zippackage/ZipPackageFolder.cxx | |
| parent | d369109afaed07318b9639c6735a26c6c85fb768 (diff) | |
#92268# if a stream has its own encryption key use that one instead of the one from the ZipPackage
Diffstat (limited to 'package/source/zippackage/ZipPackageFolder.cxx')
| -rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 403fb601d02a..565f697ca1ac 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ZipPackageFolder.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: mtg $ $Date: 2001-09-14 15:14:12 $ + * last change: $Author: mtg $ $Date: 2001-09-24 18:27:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -307,7 +307,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr pValue[1].Name = sFullPathProperty; pValue[1].Value <<= sTempName; - rInfo.pFolder->saveContents( sTempName, rManList, rZipOut, rEncryptionKey, rRandomPool); + pFolder->saveContents( sTempName, rManList, rZipOut, rEncryptionKey, rRandomPool); } else { @@ -317,7 +317,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr ZipPackageFolder::copyZipEntry ( *pTempEntry, pStream->aEntry ); pTempEntry->sName = rPath + rShortName; - sal_Bool bToBeEncrypted = pStream->IsToBeEncrypted() && bHaveEncryptionKey; + sal_Bool bToBeEncrypted = pStream->IsToBeEncrypted() && (bHaveEncryptionKey || pStream->HasOwnKey()); sal_Bool bToBeCompressed = bToBeEncrypted ? sal_True : pStream->IsToBeCompressed(); pValue[0].Name = sMediaTypeProperty; @@ -333,10 +333,16 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr rtl_random_getBytes ( rRandomPool, aVector.getArray(), 8 ); sal_Int32 nIterationCount = 1024; - rtl_digest_PBKDF2 ( reinterpret_cast < sal_uInt8 * > (aKey.getArray()), 16, - reinterpret_cast < sal_uInt8 * > (rEncryptionKey.getArray()), rEncryptionKey.getLength(), - aSalt.getConstArray(), 16, - nIterationCount ); + if ( pStream->HasOwnKey() ) + rtl_digest_PBKDF2 ( reinterpret_cast < sal_uInt8 * > (aKey.getArray()), 16, + reinterpret_cast < const sal_uInt8 * > (pStream->getKey().getConstArray()), pStream->getKey().getLength(), + aSalt.getConstArray(), 16, + nIterationCount ); + else + rtl_digest_PBKDF2 ( reinterpret_cast < sal_uInt8 * > (aKey.getArray()), 16, + reinterpret_cast < const sal_uInt8 * > (rEncryptionKey.getConstArray()), rEncryptionKey.getLength(), + aSalt.getConstArray(), 16, + nIterationCount ); pStream->setInitialisationVector ( aVector ); pStream->setSalt ( aSalt ); pStream->setIterationCount ( nIterationCount ); |