mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#86409# Allow EncryptionKey's of any length

Browse Source
This commit is contained in:
Martin Gallwey
2001-05-15 14:33:22 +00:00
parent adaf24e004
commit b66f73d7d1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/source/zippackage/ZipPackageFolder.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipPackageFolder.cxx,v $ * $RCSfile: ZipPackageFolder.cxx,v $
* *
* $Revision: 1.41 $ * $Revision: 1.42 $
* *
* last change: $Author: mtg $ $Date: 2001-05-15 13:04:04 $ * last change: $Author: mtg $ $Date: 2001-05-15 15:33:22 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -291,7 +291,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
const OUString sIterationCountProperty ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) ); const OUString sIterationCountProperty ( RTL_CONSTASCII_USTRINGPARAM ( "IterationCount" ) );
const OUString sSizeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) ); const OUString sSizeProperty ( RTL_CONSTASCII_USTRINGPARAM ( "Size" ) );
sal_Bool bHaveEncryptionKey = rEncryptionKey.getLength() == 16 ? sal_True : sal_False; sal_Bool bHaveEncryptionKey = rEncryptionKey.getLength() ? sal_True : sal_False;
// Get a random number generator and seed it with current timestamp // Get a random number generator and seed it with current timestamp
TimeValue aTime; TimeValue aTime;
@@ -393,7 +393,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
pStream->setIterationCount ( nIterationCount ); pStream->setIterationCount ( nIterationCount );
pStream->setKey ( aKey ); pStream->setKey ( aKey );
aPropSet.realloc(6); // 6th component is size, below aPropSet.realloc(6); // 6th property is size, below
aPropSet[2].Name = sInitialisationVectorProperty; aPropSet[2].Name = sInitialisationVectorProperty;
aPropSet[2].Value <<= aVector; aPropSet[2].Value <<= aVector;
aPropSet[3].Name = sSaltProperty; aPropSet[3].Name = sSaltProperty;