strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

package: remove experimental mode check

Browse source 
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.stahl@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Michael Stahl 2024-06-17 14:19:33 +02:00
parent a3ac49ebe7
commit 0cbfd84b0c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/source/zippackage/ZipPackage.cxx
View file

@ -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
{