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/xsecparser.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/xsecparser.cxx')
| -rw-r--r-- | xmlsecurity/source/helper/xsecparser.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index 7c09d731ab0a..6e6bfc45c426 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -19,6 +19,7 @@ #include "xsecparser.hxx" +#include "xmlsignaturehelper.hxx" #include <com/sun/star/xml/sax/SAXException.hpp> #include <cppuhelper/exc_hlp.hxx> @@ -28,7 +29,8 @@ namespace cssu = com::sun::star::uno; namespace cssxc = com::sun::star::xml::crypto; namespace cssxs = com::sun::star::xml::sax; -XSecParser::XSecParser(XSecController* pXSecController, +XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper, + XSecController* pXSecController, const cssu::Reference< cssxs::XDocumentHandler >& xNextHandler) : m_bInX509IssuerName(false) , m_bInX509SerialNumber(false) @@ -44,6 +46,7 @@ XSecParser::XSecParser(XSecController* pXSecController, , m_xNextHandler(xNextHandler) , m_bReferenceUnresolved(false) , m_nReferenceDigestID(cssxc::DigestID::SHA1) + , m_rXMLSignatureHelper(rXMLSignatureHelper) { } @@ -100,6 +103,7 @@ void SAL_CALL XSecParser::startElement( if ( aName == "Signature" ) { + m_rXMLSignatureHelper.StartVerifySignatureElement(); m_pXSecController->addSignature(); if (!ouIdAttr.isEmpty()) { |