diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-21 08:17:42 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-21 10:55:18 +0200 |
| commit | db3683b43f1055af831874e8a89f0e0d532e1d6a (patch) | |
| tree | b2a45167cc0031c7e674332a3455693761667bd0 /xmlsecurity/source/helper/ooxmlsecparser.cxx | |
| parent | add CVE-2017-0199 testcase (diff) | |
| download | core-db3683b43f1055af831874e8a89f0e0d532e1d6a.tar.gz core-db3683b43f1055af831874e8a89f0e0d532e1d6a.zip | |
xmlsecurity: remove no longer needed ImplXMLSignatureListener
The only remaining task it did was StartVerifySignatureElement() in
startElement(), but that can be done in OOXMLSecParser / XSecParser
easily, no need to have separate class for that.
Change-Id: I0863019d3a92a911df0d60bf872dd0978eac03d5
Reviewed-on: https://gerrit.libreoffice.org/36770
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmlsecurity/source/helper/ooxmlsecparser.cxx')
| -rw-r--r-- | xmlsecurity/source/helper/ooxmlsecparser.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx index aff5c1d302c5..26f82b0ab47c 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.cxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx @@ -9,10 +9,11 @@ #include "ooxmlsecparser.hxx" +#include "xmlsignaturehelper.hxx" using namespace com::sun::star; -OOXMLSecParser::OOXMLSecParser(XSecController* pXSecController) +OOXMLSecParser::OOXMLSecParser(XMLSignatureHelper& rXMLSignatureHelper, XSecController* pXSecController) : m_pXSecController(pXSecController) ,m_bInDigestValue(false) ,m_bInSignatureValue(false) @@ -23,6 +24,7 @@ OOXMLSecParser::OOXMLSecParser(XSecController* pXSecController) ,m_bInX509SerialNumber(false) ,m_bInCertDigest(false) ,m_bReferenceUnresolved(false) + ,m_rXMLSignatureHelper(rXMLSignatureHelper) { } @@ -50,6 +52,7 @@ void SAL_CALL OOXMLSecParser::startElement(const OUString& rName, const uno::Ref if (rName == "Signature") { + m_rXMLSignatureHelper.StartVerifySignatureElement(); m_pXSecController->addSignature(); if (!aId.isEmpty()) m_pXSecController->setId(aId); |