diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-20 14:00:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-20 14:00:01 +0100 |
| commit | 8db1b13e721683d0263925c8e0300dd86a022814 (patch) | |
| tree | 6baac1f7d2d478dea6e51b7769a45d5ed0e098d8 /include/oox/crypto | |
| parent | 491884350ce74f36044b3348bd66356ad1c234af (diff) | |
clarify hash lengths a bit more
Change-Id: I66cea4b9efb82d29e6c052ac11a6f2eaca823ce0
Diffstat (limited to 'include/oox/crypto')
| -rw-r--r-- | include/oox/crypto/Standard2007Engine.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index b4130539e57c..2ee4a553a918 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -52,8 +52,9 @@ const sal_uInt32 VERSION_INFO_AGILE = 0x00040004; const sal_uInt32 SALT_LENGTH = 16; const sal_uInt32 ENCRYPTED_VERIFIER_LENGTH = 16; -const sal_uInt32 ENCRYPTED_RC4_VERIFIER_HASH_LENGTH = 20; -const sal_uInt32 ENCRYPTED_AES_VERIFIER_HASH_LENGTH = 32; +const sal_uInt32 ENCRYPTED_SHA1_VERIFIER_HASH_LENGTH = 20; +const sal_uInt32 ENCRYPTED_SHA256_VERIFIER_HASH_LENGTH = 32; +const sal_uInt32 ENCRYPTED_SHA512_VERIFIER_HASH_LENGTH = 64; struct EncryptionStandardHeader { @@ -75,7 +76,7 @@ struct EncryptionVerifierAES sal_uInt8 salt[SALT_LENGTH]; // random generated salt value sal_uInt8 encryptedVerifier[ENCRYPTED_VERIFIER_LENGTH]; // randomly generated verifier value sal_uInt32 encryptedVerifierHashSize; // actually written hash size - depends on algorithm - sal_uInt8 encryptedVerifierHash[ENCRYPTED_AES_VERIFIER_HASH_LENGTH]; // verifier value hash - itself also encrypted + sal_uInt8 encryptedVerifierHash[ENCRYPTED_SHA256_VERIFIER_HASH_LENGTH]; // verifier value hash - itself also encrypted EncryptionVerifierAES(); }; |