diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2019-11-18 11:26:23 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-05-25 10:03:53 +0200 |
| commit | 2f17679a46ca1336cb82ef652e09f423c5b8923d (patch) | |
| tree | 017af2f0f8f99b96df4cae7a7b3259d4f42e98a3 /package | |
| parent | 99f8714280d3d451cadce63e59aec27f584bc6d3 (diff) | |
package: ignore unknown encryption parameters.
Do not throw an exception if there are encryption parameters,
but they are not supported in current output format. Invalid or
unsupported encryption then fails higher up the stack.
Change-Id: I21e4cf2f73d7c218ab5444b2016e838695163ca3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84435
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index c483b53c968a..02aed7a66a2e 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1645,11 +1645,6 @@ uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey() for ( const auto& rKey : std::as_const(m_aStorageEncryptionKeys) ) if ( rKey.Name == aNameToFind ) rKey.Value >>= aResult; - - // empty keys are not allowed here - // so it is not important whether there is no key, or the key is empty, it is an error - if ( !aResult.hasElements() ) - throw uno::RuntimeException(THROW_WHERE "No expected key is provided!" ); } else aResult = m_aEncryptionKey; |