diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-05-15 15:12:23 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2020-07-22 14:15:54 +0200 |
commit | b65d956ecec1fc1acc2e037f426f3485d7b8fa0e (patch) | |
tree | ff7b66a2aaa4470db6625adc561e95c2d3c59684 /xmlsecurity/qa | |
parent | 85e074b4f8c99e1ca585ea1d398fdc16542eb9af (diff) |
package: OFFICE-3940 ODF 1.3 import of OpenPGP encryption
This was supposed to be implemented by commit
a7bf6488ebb544e1efaed0a1e53073df9cc2064d
"ODF1.3: import new OpenPGP encryption markup"
but it turns out that the ODF 1.3 cs01 schema differs from the
implementation:
in ODF 1.3 cs01 we have
<manifest:encrypted-key>
<manifest:encryption-method .../>
<manifest:keyinfo>
<manifest:PGPData>
</manifest:PGPData>
</manifest:keyinfo>
<manifest:CipherData>
</manifest:CipherData>
</manifest:encrypted-key>
whereas the implementation expects
<manifest:keyinfo>
<manifest:encrypted-key>
<manifest:encryption-method .../>
<manifest:PGPData>
</manifest:PGPData>
<manifest:CipherData>
</manifest:CipherData>
</manifest:encrypted-key>
</manifest:keyinfo>
Ideally the inner manifest:keyinfo should be manifest:KeyInfo but
not sure if that really matters.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94309
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 4f1b0f7d5235140611305b784b58f95fc5b8bd81)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94586
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit a3ef13b495d5898488ae52981bdaf8cf34db791c)
Change-Id: I407321c857e7b3ed9f4d04568ca2ea116764b3da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99155
Tested-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'xmlsecurity/qa')
-rw-r--r-- | xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt | bin | 15981 -> 12982 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt b/xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt Binary files differindex 6bcc43503267..e738c2f6df89 100644 --- a/xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt +++ b/xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt |