summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-12-13 21:30:27 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2023-12-14 10:36:44 +0100
commit77ceeb844ac042f6a6089748ab4f1420c5dae5e9 (patch)
tree8b24404127d4743a873260fc46a62d5e59f0af35 /package
parent3282756b7984457c79044d08127a4def64905979 (diff)
package: GPG encryption: prevent manifest:start-key-generation ...
... completely, as currently it was generated for the first file-entry due to too late setting of bStoreStartKeyGeneration. Change-Id: I0cc80169deeea133bff45545fdf20fab6a6bedaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160716 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'package')
-rw-r--r--package/source/manifest/ManifestExport.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index aa9e9aa2a32f..950e47f49741 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -186,6 +186,10 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con
if ( pKeyInfoProperty )
{
+ // no start-key-generation needed, our session key has
+ // max size already
+ bStoreStartKeyGeneration = false;
+
// yeah, so that goes directly below the manifest:manifest
// element
OUStringBuffer aBuffer;
@@ -451,9 +455,6 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > con
{
pNewAttrList->AddAttribute(ATTRIBUTE_KEY_DERIVATION_NAME,
sPGP_Name);
- // no start-key-generation needed, our session key has
- // max size already
- bStoreStartKeyGeneration = false;
}
else
{