diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-12-24 15:11:30 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-01-03 07:34:03 +0100 |
| commit | 540f4c06a025ede65addf3b894feab7b9ffece12 (patch) | |
| tree | b631e7556c76be8505d454190e7ed9342191d42e /xmlsecurity/inc/documentsignaturemanager.hxx | |
| parent | tdf#122156: closing a section link should not clear its Hidden flag (diff) | |
| download | core-540f4c06a025ede65addf3b894feab7b9ffece12.tar.gz core-540f4c06a025ede65addf3b894feab7b9ffece12.zip | |
Fix signing empty Configurations2/accelerator/current.xml
When determining if a file is an XML file for siging, we need to
read the manifest file to get an accurate detection. In case when
we were signing in the GUI the manifest file was read when the
storage was set. When we didn't sign over the GUI, the manifest
was never read: the code was only present in the GUI code -
"documentsignaturesdialog.cxx" so the detection was wrong and
isXML returned "true" for current.xml.
With this we move the manifest reading to DigitalSignatureManager,
where the manifest is read when needed.
Reviewed-on: https://gerrit.libreoffice.org/65600
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 49fcd3bbb30f93763fc5cb80fa6ac5cec5d00834)
Change-Id: If45a32af6410bc5f7c5afdb976b182bd69ab7d6b
Diffstat (limited to 'xmlsecurity/inc/documentsignaturemanager.hxx')
| -rw-r--r-- | xmlsecurity/inc/documentsignaturemanager.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xmlsecurity/inc/documentsignaturemanager.hxx b/xmlsecurity/inc/documentsignaturemanager.hxx index bae54619cbd5..6c70e55224dd 100644 --- a/xmlsecurity/inc/documentsignaturemanager.hxx +++ b/xmlsecurity/inc/documentsignaturemanager.hxx @@ -59,6 +59,8 @@ public: * differently when they are signed (c14n transformation) */ bool isXML(const OUString& rURI); + bool readManifest(); + SignatureStreamHelper ImplOpenSignatureStream(sal_Int32 nStreamOpenMode, bool bTempStream); /// Add a new signature, using xCert as a signing certificate, and rDescription as description. bool add(const css::uno::Reference<css::security::XCertificate>& xCert, |