[Libreoffice-commits] core.git: oox/source
Tor Lillqvist
tml at iki.fi
Tue Aug 13 21:23:05 PDT 2013
oox/source/core/DocumentCrypt.cxx | 26 --------------------------
1 file changed, 26 deletions(-)
New commits:
commit 02769c812e869a2a9494582635aaf16e88c856ee
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Aug 14 07:17:40 2013 +0300
WaE: unused function 'lclReadEncryptionInfo'
Change-Id: I5c98b96b77b1366884bdc593cf29d32d4e60de7b
diff --git a/oox/source/core/DocumentCrypt.cxx b/oox/source/core/DocumentCrypt.cxx
index 6fe59ab..640e417 100644
--- a/oox/source/core/DocumentCrypt.cxx
+++ b/oox/source/core/DocumentCrypt.cxx
@@ -88,32 +88,6 @@ void lclRandomGenerateValues( sal_Int32 nLength, sal_uInt8* aArray )
rtl_random_destroyPool ( aRandomPool );
}
-bool lclReadEncryptionInfo( PackageEncryptionInfo& rEncrInfo, BinaryInputStream& rStrm )
-{
- rStrm.skip( 4 );
- rStrm >> rEncrInfo.mnFlags;
- if( getFlag( rEncrInfo.mnFlags, ENCRYPTINFO_EXTERNAL ) )
- return false;
-
- sal_uInt32 nHeaderSize, nRepeatedFlags;
- rStrm >> nHeaderSize >> nRepeatedFlags;
- if( (nHeaderSize < 20) || (nRepeatedFlags != rEncrInfo.mnFlags) )
- return false;
-
- rStrm.skip( 4 );
- rStrm >> rEncrInfo.mnAlgorithmId >> rEncrInfo.mnAlgorithmIdHash >> rEncrInfo.mnKeySize;
- rStrm.skip( nHeaderSize - 20 );
- rStrm >> rEncrInfo.mnSaltSize;
- if( rEncrInfo.mnSaltSize != 16 )
- return false;
-
- rStrm.readMemory( rEncrInfo.mpnSalt, 16 );
- rStrm.readMemory( rEncrInfo.mpnEncrVerifier, 16 );
- rStrm >> rEncrInfo.mnVerifierHashSize;
- rStrm.readMemory( rEncrInfo.mpnEncrVerifierHash, 32 );
- return !rStrm.isEof();
-}
-
struct EncryptionStandardHeader {
sal_uInt32 flags;
sal_uInt32 sizeExtra;
More information about the Libreoffice-commits
mailing list