diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-24 13:44:49 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-24 13:44:49 +0100 |
commit | 481a55dc3bbf3c97c828fa727f4c30f0d8ab171e (patch) | |
tree | a29bf2cc93a7ed15d2903dae903703f4fee6beac /package/inc/EncryptedDataHeader.hxx | |
parent | 0cdc1272fdfbf181b6f297185e0a02dddb912a1a (diff) |
mav60: #164341# fix problems with the new implementation
Diffstat (limited to 'package/inc/EncryptedDataHeader.hxx')
-rw-r--r-- | package/inc/EncryptedDataHeader.hxx | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx index 70d83ea300d7..be2c7643ec51 100644 --- a/package/inc/EncryptedDataHeader.hxx +++ b/package/inc/EncryptedDataHeader.hxx @@ -31,24 +31,25 @@ /* The structure of this header is as follows: - Header signature 4 bytes - Version number 2 bytes - Iteraction count 4 bytes - Size 4 bytes - EncAlgorithm 4 bytes - DigestAlgorithm 4 bytes - DerivedKeySize 4 bytes - Salt length 2 bytes - IV length 2 bytes - Digest length 2 bytes - MediaType length 2 bytes - Salt content X bytes - IV content X bytes - digest content X bytes - MediaType X bytes + Header signature 4 bytes + Version number 2 bytes + Iteraction count 4 bytes + Size 4 bytes + EncAlgorithm 4 bytes + DigestAlgorithm 4 bytes + DerivedKeySize 4 bytes + StartKeyAlgorithm 4 bytes + Salt length 2 bytes + IV length 2 bytes + Digest length 2 bytes + MediaType length 2 bytes + Salt content X bytes + IV content X bytes + digest content X bytes + MediaType X bytes */ const sal_uInt32 n_ConstHeader = 0x05024d4dL; // "MM\002\005" -const sal_Int32 n_ConstHeaderSize = 34; // + salt length + iv length + digest length + mediatype length +const sal_Int32 n_ConstHeaderSize = 38; // + salt length + iv length + digest length + mediatype length const sal_Int16 n_ConstCurrentVersion = 1; #endif |