summaryrefslogtreecommitdiff
path: root/package/source/xstor/owriteablestream.hxx
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-11-29 13:07:57 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-11-23 10:23:39 +0100
commited09f3091f9415cb7f93e6eb48ecb5e0b7840b76 (patch)
treee767e755395601b0b6e07155a859d1ccab9c738d /package/source/xstor/owriteablestream.hxx
parent366c7c967f0bf1d6a4451657316f54005fcf2fd2 (diff)
tdf#118639: store ODF encryption data for autorecovery
When saving autorecovery information, ODF is used. If the original document is password-protected, its autorecovery is also generated password-protected (since ef87ff6680f79362a431db6e7ef2f40cfc576219). But when the stored encryption data for non-ODF document does not contain "PackageSHA256UTF8EncryptionKey" value, following ZipPackage::GetEncryptionKey fails, so the whole save fails. So just generate and append ODF encryption keys where we still have user password. Reviewed-on: https://gerrit.libreoffice.org/84052 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 63634738dd03cc74806ce6843c16ff5e51a371a0) Reviewed-on: https://gerrit.libreoffice.org/84133 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org> (cherry picked from commit e569dc9824e95617d921bb8f115d243aea0125b9) Reviewed-on: https://gerrit.libreoffice.org/84232 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Change-Id: I776e28de784489521e4941d1075690f90c056014 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94355 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'package/source/xstor/owriteablestream.hxx')
0 files changed, 0 insertions, 0 deletions