diff options
| author | Balazs Varga <balazs.varga.extern@allotropia.de> | 2023-08-22 22:10:20 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-08-30 14:34:39 +0200 |
| commit | 9254fbce6b9e20a75aa2a379bcf2fc9dc41a5b44 (patch) | |
| tree | 9d4e6904934321ce76d1d4b6c6a85d8a396887c9 /include | |
| parent | 53fed6a869d0fa983dd28a2f4c62b46d1e67a9f5 (diff) | |
tdf#156835 - FILEOPEN XLSX: add SHA-384 encryption support for ooxml import
Password protected file with SHA-384 encryption does not open before this
patch.
Change-Id: I482233f788b8e9da210ad6d2a6c4ece18d05d248
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156282
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/hash.hxx | 2 | ||||
| -rw-r--r-- | include/oox/crypto/AgileEngine.hxx | 1 | ||||
| -rw-r--r-- | include/oox/crypto/CryptTools.hxx | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/comphelper/hash.hxx b/include/comphelper/hash.hxx index 54ab3a25105c..a3ad468d3eb5 100644 --- a/include/comphelper/hash.hxx +++ b/include/comphelper/hash.hxx @@ -27,12 +27,14 @@ enum class HashType MD5, SHA1, SHA256, + SHA384, SHA512 }; const sal_uInt32 MD5_HASH_LENGTH = RTL_DIGEST_LENGTH_MD5; const sal_uInt32 SHA1_HASH_LENGTH = RTL_DIGEST_LENGTH_SHA1; const sal_uInt32 SHA256_HASH_LENGTH = 32; +const sal_uInt32 SHA384_HASH_LENGTH = 48; const sal_uInt32 SHA512_HASH_LENGTH = 64; struct HashImpl; diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index ece492871163..07ce3cb5eeb1 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -70,6 +70,7 @@ struct OOX_DLLPUBLIC AgileEncryptionParameters enum class AgileEncryptionPreset { AES_128_SHA1, + AES_128_SHA384, AES_256_SHA512, }; diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index c8c1420079bd..10382b979380 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -48,6 +48,7 @@ enum class CryptoHashType { SHA1, SHA256, + SHA384, SHA512 }; |