package/source/manifest/ManifestExport.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 77ceeb844ac042f6a6089748ab4f1420c5dae5e9
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Dec 13 21:30:27 2023 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Dec 14 10:36:44 2023 +0100
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.st...@allotropia.de>
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
{
