diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2022-02-07 11:58:16 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-02-23 13:30:24 +0100 |
| commit | 3467b8b63f100e5474673727f137778fed7ccad5 (patch) | |
| tree | af5c0404ac89ca30a6516a18b670468a578990ef /comphelper | |
| parent | a2ba9119d941fa4383bf41da0d55b3373218b68f (diff) | |
tdf#147086 OOXML export: don't save the empty editing password
Saving with opening password, but without editing password
resulted read-only documents (only on their original path: saving,
i.e. copying the file in a different path was a workaround for
the lost permission).
Regression from commit 1b53c1dfc76f08ca7df40a0673aa50eca700d072
(tdf#144374 DOCX: export the password for editing).
Change-Id: I2759dc876ee7668d00eee0aa81490c9d1e0c272b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129593
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130060
Tested-by: Jenkins
(cherry picked from commit f7e03352c18e13161effcfe08c7591d3be11b3e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130088
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/docpasswordhelper.cxx | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 71f92db48d00..952368bc91ed 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -111,23 +111,26 @@ DocPasswordHelper::GenerateNewModifyPasswordInfoOOXML(std::u16string_view aPassw { uno::Sequence<beans::PropertyValue> aResult; - uno::Sequence<sal_Int8> aSalt = GenerateRandomByteSequence(16); - OUStringBuffer aBuffer; - comphelper::Base64::encode(aBuffer, aSalt); - OUString sSalt = aBuffer.toString(); + if (!aPassword.empty()) + { + uno::Sequence<sal_Int8> aSalt = GenerateRandomByteSequence(16); + OUStringBuffer aBuffer; + comphelper::Base64::encode(aBuffer, aSalt); + OUString sSalt = aBuffer.toString(); - sal_Int32 const nIterationCount = 100000; - OUString sAlgorithm("SHA-512"); + sal_Int32 const nIterationCount = 100000; + OUString sAlgorithm("SHA-512"); - const OUString sHash(GetOoxHashAsBase64(OUString(aPassword), sSalt, nIterationCount, - comphelper::Hash::IterCount::APPEND, sAlgorithm)); + const OUString sHash(GetOoxHashAsBase64(OUString(aPassword), sSalt, nIterationCount, + comphelper::Hash::IterCount::APPEND, sAlgorithm)); - if (!sHash.isEmpty()) - { - aResult = { comphelper::makePropertyValue("algorithm-name", sAlgorithm), - comphelper::makePropertyValue("salt", sSalt), - comphelper::makePropertyValue("iteration-count", nIterationCount), - comphelper::makePropertyValue("hash", sHash) }; + if (!sHash.isEmpty()) + { + aResult = { comphelper::makePropertyValue("algorithm-name", sAlgorithm), + comphelper::makePropertyValue("salt", sSalt), + comphelper::makePropertyValue("iteration-count", nIterationCount), + comphelper::makePropertyValue("hash", sHash) }; + } } return aResult; |