mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xmlsecurity: import OOXML <X509Certificate>

Browse Source 
Change-Id: I051b3b0f69567cf7bcf4837ab6ccda221142b49e
This commit is contained in:
Miklos Vajna
2016-01-14 09:27:30 +01:00
parent 4ab8711c1c
commit 7ccffbf566
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xmlsecurity/source/helper/ooxmlsecparser.cxx
View File

@@ -13,9 +13,10 @@
using namespace com::sun::star; using namespace com::sun::star;
OOXMLSecParser::OOXMLSecParser(XSecController* pXSecController) OOXMLSecParser::OOXMLSecParser(XSecController* pXSecController)
: m_pXSecController(pXSecController), : m_pXSecController(pXSecController)
m_bInDigestValue(false), ,m_bInDigestValue(false)
m_bInSignatureValue(false) ,m_bInSignatureValue(false)
,m_bInX509Certificate(false)
{ {
} }
@@ -65,6 +66,11 @@ throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
m_aSignatureValue.clear(); m_aSignatureValue.clear();
m_bInSignatureValue = true; m_bInSignatureValue = true;
} }
else if (rName == "X509Certificate")
{
m_aX509Certificate.clear();
m_bInX509Certificate = true;
}
if (m_xNextHandler.is()) if (m_xNextHandler.is())
m_xNextHandler->startElement(rName, xAttribs); m_xNextHandler->startElement(rName, xAttribs);
@@ -83,6 +89,11 @@ void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) throw (xml::sax:
m_pXSecController->setSignatureValue(m_aSignatureValue); m_pXSecController->setSignatureValue(m_aSignatureValue);
m_bInSignatureValue = false; m_bInSignatureValue = false;
} }
else if (rName == "X509Certificate")
{
m_pXSecController->setX509Certificate(m_aX509Certificate);
m_bInX509Certificate = false;
}
if (m_xNextHandler.is()) if (m_xNextHandler.is())
m_xNextHandler->endElement(rName); m_xNextHandler->endElement(rName);
@@ -94,6 +105,8 @@ void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) throw (xml::sax
m_aDigestValue += rChars; m_aDigestValue += rChars;
else if (m_bInSignatureValue) else if (m_bInSignatureValue)
m_aSignatureValue += rChars; m_aSignatureValue += rChars;
else if (m_bInX509Certificate)
m_aX509Certificate += rChars;
if (m_xNextHandler.is()) if (m_xNextHandler.is())
m_xNextHandler->characters(rChars); m_xNextHandler->characters(rChars);

2
xmlsecurity/source/helper/ooxmlsecparser.hxx
View File

@@ -33,6 +33,8 @@ class OOXMLSecParser: public cppu::WeakImplHelper
OUString m_aDigestValue; OUString m_aDigestValue;
bool m_bInSignatureValue; bool m_bInSignatureValue;
OUString m_aSignatureValue; OUString m_aSignatureValue;
bool m_bInX509Certificate;
OUString m_aX509Certificate;
public: public:
OOXMLSecParser(XSecController* pXSecController); OOXMLSecParser(XSecController* pXSecController);