Custom KeyInfo support in signature creation.

[shibboleth/cpp-xmltooling.git] / xmltooling / signature / impl / XMLSecSignatureImpl.cpp

diff --git a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
index 4bd7653..2d97b94 100644 (file)
--- a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
+++ b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
@@ -148,10 +148,17 @@ void XMLSecSignatureImpl::sign(const SigningContext& ctx)
     try {\r
         log.debug("creating signature content");\r
         ctx.createSignature(m_signature);\r
-        const std::vector<XSECCryptoX509*>& certs=ctx.getX509Certificates();\r
-        if (!certs.empty()) {\r
+        const std::vector<XSECCryptoX509*>* certs=ctx.getX509Certificates();\r
+        if (certs && !certs->empty()) {\r
             DSIGKeyInfoX509* x509Data=m_signature->appendX509Data();\r
-            for_each(certs.begin(),certs.end(),bind1st(_addcert(),x509Data));\r
+            for_each(certs->begin(),certs->end(),bind1st(_addcert(),x509Data));\r
+        }\r
+        else {\r
+            auto_ptr<KeyInfo> keyInfo(ctx.getKeyInfo());\r
+            if (keyInfo.get()) {\r
+                DOMElement* domElement=keyInfo->marshall(m_signature->getParentDocument());\r
+                getDOM()->appendChild(domElement);\r
+            }\r
         }\r
         \r
         log.debug("computing signature");\r