[Libreoffice-commits] core.git: package/source

[Vasily Melenchuk (via logerrit)]

 package/source/zippackage/ZipPackage.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 2f17679a46ca1336cb82ef652e09f423c5b8923d
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Mon Nov 18 11:26:23 2019 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon May 25 10:03:53 2020 +0200

    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 at CIB.de>

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;