Refactored Signature signing/validation, various Validator bugs fixed.

[shibboleth/cpp-xmltooling.git] / xmltooling / impl / UnknownElement.cpp

diff --git a/xmltooling/impl/UnknownElement.cpp b/xmltooling/impl/UnknownElement.cpp
index 50c1954..27fcfd9 100644 (file)
--- a/xmltooling/impl/UnknownElement.cpp
+++ b/xmltooling/impl/UnknownElement.cpp
@@ -70,7 +70,12 @@ void UnknownElementImpl::serialize(string& s) const
         XMLHelper::serialize(getDOM(),s);\r
 }\r
 \r
-DOMElement* UnknownElementImpl::marshall(DOMDocument* document, MarshallingContext* ctx) const\r
+DOMElement* UnknownElementImpl::marshall(\r
+    DOMDocument* document\r
+#ifndef XMLTOOLING_NO_XMLSEC\r
+    ,const std::vector<xmlsignature::Signature*>* sigs\r
+#endif\r
+    ) const\r
 {\r
 #ifdef _DEBUG\r
     xmltooling::NDC ndc("marshall");\r
@@ -107,7 +112,7 @@ DOMElement* UnknownElementImpl::marshall(DOMDocument* document, MarshallingConte
     MemBufInputSource src(reinterpret_cast<const XMLByte*>(m_xml.c_str()),m_xml.length(),"UnknownElementImpl");\r
     Wrapper4InputSource dsrc(&src,false);\r
     log.debug("parsing XML back into DOM tree");\r
-    DOMDocument* internalDoc=XMLToolingInternalConfig::getInternalConfig().m_parserPool->parse(dsrc);\r
+    DOMDocument* internalDoc=XMLToolingConfig::getConfig().getParser().parse(dsrc);\r
     if (document) {\r
         // The caller insists on using his own document, so we now have to import the thing\r
         // into it. Then we're just dumping the one we built.\r
@@ -131,7 +136,13 @@ DOMElement* UnknownElementImpl::marshall(DOMDocument* document, MarshallingConte
     return cachedDOM;\r
 }\r
 \r
-DOMElement* UnknownElementImpl::marshall(DOMElement* parentElement, MarshallingContext* ctx) const\r
+\r
+DOMElement* UnknownElementImpl::marshall(\r
+    DOMElement* parentElement\r
+#ifndef XMLTOOLING_NO_XMLSEC\r
+    ,const std::vector<xmlsignature::Signature*>* sigs\r
+#endif\r
+    ) const\r
 {\r
 #ifdef _DEBUG\r
     xmltooling::NDC ndc("marshall");\r
@@ -166,7 +177,7 @@ DOMElement* UnknownElementImpl::marshall(DOMElement* parentElement, MarshallingC
     MemBufInputSource src(reinterpret_cast<const XMLByte*>(m_xml.c_str()),m_xml.length(),"UnknownElementImpl");\r
     Wrapper4InputSource dsrc(&src,false);\r
     log.debug("parsing XML back into DOM tree");\r
-    DOMDocument* internalDoc=XMLToolingInternalConfig::getInternalConfig().m_parserPool->parse(dsrc);\r
+    DOMDocument* internalDoc=XMLToolingConfig::getConfig().getParser().parse(dsrc);\r
     \r
     log.debug("reimporting new DOM into caller-supplied document");\r
     cachedDOM=static_cast<DOMElement*>(parentElement->getOwnerDocument()->importNode(internalDoc->getDocumentElement(), true));\r