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

remove outputLength variable when calculating encryption verifier

Browse Source 
Change-Id: I144957b64ba2b693db61c17e42b08014124f8c99
This commit is contained in:
Tomaž Vajngerl
2015-09-28 16:56:31 +02:00
parent f306af880b
commit 2f9d2919e1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oox/source/crypto/Standard2007Engine.cxx
View File

@@ -72,7 +72,6 @@ bool Standard2007Engine::generateVerifier()
if (mKey.size() != 16) if (mKey.size() != 16)
return false; return false;
sal_uInt32 outputLength;
vector<sal_uInt8> verifier(ENCRYPTED_VERIFIER_LENGTH); vector<sal_uInt8> verifier(ENCRYPTED_VERIFIER_LENGTH);
vector<sal_uInt8> encryptedVerifier(ENCRYPTED_VERIFIER_LENGTH); vector<sal_uInt8> encryptedVerifier(ENCRYPTED_VERIFIER_LENGTH);
@@ -80,8 +79,7 @@ bool Standard2007Engine::generateVerifier()
vector<sal_uInt8> iv; vector<sal_uInt8> iv;
Encrypt aEncryptorVerifier(mKey, iv, Crypto::AES_128_ECB); Encrypt aEncryptorVerifier(mKey, iv, Crypto::AES_128_ECB);
outputLength = aEncryptorVerifier.update(encryptedVerifier, verifier); if (aEncryptorVerifier.update(encryptedVerifier, verifier) != ENCRYPTED_VERIFIER_LENGTH)
if (outputLength != ENCRYPTED_VERIFIER_LENGTH)
return false; return false;
std::copy(encryptedVerifier.begin(), encryptedVerifier.end(), mInfo.verifier.encryptedVerifier); std::copy(encryptedVerifier.begin(), encryptedVerifier.end(), mInfo.verifier.encryptedVerifier);
@@ -93,7 +91,7 @@ bool Standard2007Engine::generateVerifier()
vector<sal_uInt8> encryptedHash(ENCRYPTED_VERIFIER_HASH_LENGTH, 0); vector<sal_uInt8> encryptedHash(ENCRYPTED_VERIFIER_HASH_LENGTH, 0);
Encrypt aEncryptorHash(mKey, iv, Crypto::AES_128_ECB); Encrypt aEncryptorHash(mKey, iv, Crypto::AES_128_ECB);
outputLength = aEncryptorHash.update(encryptedHash, hash, hash.size()); aEncryptorHash.update(encryptedHash, hash, hash.size());
std::copy(encryptedHash.begin(), encryptedHash.end(), mInfo.verifier.encryptedVerifierHash); std::copy(encryptedHash.begin(), encryptedHash.end(), mInfo.verifier.encryptedVerifierHash);
return true; return true;