package/source/zippackage/ZipPackage.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d5b06b32bf86a2a8d3cb525f44ae62ed8312353f
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Jun 17 14:19:33 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jun 17 20:18:26 2024 +0200
package: remove experimental mode check
It should check for the wholesome encryption more directly; PBKDF2 is
unreachable from the UI in this case anyway, this can only be tested
with LO_ARGON2_DISABLE=1 in the environment.
Change-Id: I5e74471300df1c6ef3892dc544f13328e5898abb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168998
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Jenkins
(cherry picked from commit 0cbfd84b0c57a831b2ff48239aa9926482f49f8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169012
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index c2ccd2762af0..907ed1b4112e 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1334,7 +1334,7 @@ uno::Reference< io::XInputStream >
ZipPackage::writeTempFile()
{
if (m_nKeyDerivationFunctionID == xml::crypto::KDFID::PBKDF2)
{ // if there is only one KDF invocation, increase the
safety margin
-
oPBKDF2IterationCount.emplace(officecfg::Office::Common::Misc::ExperimentalMode::get()
? 600000 : 100000);
+
oPBKDF2IterationCount.emplace(m_xRootFolder->hasByName(u"encrypted-package"_ustr)
? 600000 : 100000);
}
else
{
