diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-28 15:17:40 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-07-02 10:52:31 +0200 |
| commit | 8714906f5430525027bcfb84b90eb5b80e512c8c (patch) | |
| tree | a6c2a67ffb80e73359fc67333a089d17a1bb3fef /xmlsecurity | |
| parent | 3365c2b69d3500d5e9ce0967ec8479a453609d91 (diff) | |
ODF1.3: import new OpenPGP encryption markup
With OFFICE-3940 the loext markup got accepted for ODF1.3 (and
the redundant KeyInfo element removed). Make sure manifest parser
can import new markup.
Change-Id: Id3c88654e8e6e0e256cd68fbb43f1ef670849cf7
Reviewed-on: https://gerrit.libreoffice.org/56597
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit a7bf6488ebb544e1efaed0a1e53073df9cc2064d)
Reviewed-on: https://gerrit.libreoffice.org/56678
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit dd9232a6b2bcd32c7279e1476445214c6bb9e417)
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt | bin | 0 -> 15981 bytes | |||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 8 |
2 files changed, 8 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 differnew file mode 100644 index 000000000000..6bcc43503267 --- /dev/null +++ b/xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index b7cc077d2097..265f0e5acbb0 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -751,11 +751,19 @@ void SigningTest::testODFBrokenDsigGPG() void SigningTest::testODFEncryptedGPG() { + // ODF1.2 + loext flavour createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); CPPUNIT_ASSERT(pBaseModel); SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell(); CPPUNIT_ASSERT(pObjectShell); + + // ODF1.3 flavour + createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG_odf13.odt"); + pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); + CPPUNIT_ASSERT(pBaseModel); + pObjectShell = pBaseModel->GetObjectShell(); + CPPUNIT_ASSERT(pObjectShell); } #endif |