From 491884350ce74f36044b3348bd66356ad1c234af Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 20 Oct 2016 13:41:03 +0100 Subject: hash len is 20 for xls cryptoapi configuration Change-Id: I6e06b8578959b8147043179db57e875b1d98d57d --- oox/source/crypto/Standard2007Engine.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'oox/source') diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx index 34fa2265a719..98b94a173940 100644 --- a/oox/source/crypto/Standard2007Engine.cxx +++ b/oox/source/crypto/Standard2007Engine.cxx @@ -90,9 +90,9 @@ bool Standard2007Engine::generateVerifier() vector hash(RTL_DIGEST_LENGTH_SHA1, 0); mInfo.verifier.encryptedVerifierHashSize = RTL_DIGEST_LENGTH_SHA1; Digest::sha1(hash, verifier); - hash.resize(ENCRYPTED_VERIFIER_HASH_LENGTH, 0); + hash.resize(ENCRYPTED_AES_VERIFIER_HASH_LENGTH, 0); - vector encryptedHash(ENCRYPTED_VERIFIER_HASH_LENGTH, 0); + vector encryptedHash(ENCRYPTED_AES_VERIFIER_HASH_LENGTH, 0); Encrypt aEncryptorHash(mKey, iv, Crypto::AES_128_ECB); aEncryptorHash.update(encryptedHash, hash, hash.size()); @@ -162,10 +162,10 @@ bool Standard2007Engine::generateEncryptionKey(const OUString& password) mInfo.verifier.encryptedVerifier + ENCRYPTED_VERIFIER_LENGTH, encryptedVerifier.begin()); - vector encryptedHash(ENCRYPTED_VERIFIER_HASH_LENGTH); + vector encryptedHash(ENCRYPTED_AES_VERIFIER_HASH_LENGTH); std::copy( mInfo.verifier.encryptedVerifierHash, - mInfo.verifier.encryptedVerifierHash + ENCRYPTED_VERIFIER_HASH_LENGTH, + mInfo.verifier.encryptedVerifierHash + ENCRYPTED_AES_VERIFIER_HASH_LENGTH, encryptedHash.begin()); vector verifier(encryptedVerifier.size(), 0); -- cgit