diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-09 17:29:09 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-09 17:29:09 +0100 |
commit | 7422ecbc2a6057dfcd4d2237da3f581965d270f3 (patch) | |
tree | 3fd61f6f4aac635e0a82151c34f15d4510c73204 /package/inc/EncryptedDataHeader.hxx | |
parent | c395e5608ce118f4296083632d6662f278f0b8fc (diff) |
mav60: #164341# support AES encryption
Diffstat (limited to 'package/inc/EncryptedDataHeader.hxx')
-rw-r--r-- | package/inc/EncryptedDataHeader.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx index a166397cce34..70d83ea300d7 100644 --- a/package/inc/EncryptedDataHeader.hxx +++ b/package/inc/EncryptedDataHeader.hxx @@ -35,6 +35,9 @@ 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 @@ -45,7 +48,7 @@ MediaType X bytes */ -const sal_uInt32 n_ConstHeader = 0x0502474dL; // "MG\002\005" -const sal_Int32 n_ConstHeaderSize = 22; // + salt length + iv length + digest length + mediatype length +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_Int16 n_ConstCurrentVersion = 1; #endif |