X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=samltest%2Fsignature%2FSAML2AssertionTest.h;h=6bf5bec32270d622f20c3f5cff65ef6b0a6e01b0;hb=3b5fa692edf516a45b6d7cee06aa67ffa3219f58;hp=0245bcefbfa52fb5099d71e2643a19a817a1ad76;hpb=2fbc97e0dd6b51eed1e9b07c90e4317bd74e2e34;p=shibboleth%2Fcpp-opensaml.git

diff --git a/samltest/signature/SAML2AssertionTest.h b/samltest/signature/SAML2AssertionTest.h
index 0245bce..6bf5bec 100644
--- a/samltest/signature/SAML2AssertionTest.h
+++ b/samltest/signature/SAML2AssertionTest.h
@@ -66,13 +66,14 @@ public:
         // Append a Signature.
         Signature* sig=SignatureBuilder::buildSignature();
         assertion->setSignature(sig);
-        sig->setSigningKey(m_key->clone());
+        Locker locker(m_resolver);
+        sig->setSigningKey(m_resolver->getKey());
 
         // Build KeyInfo.
         KeyInfo* keyInfo=KeyInfoBuilder::buildKeyInfo();
         X509Data* x509Data=X509DataBuilder::buildX509Data();
         keyInfo->getX509Datas().push_back(x509Data);
-        for_each(m_certs.begin(),m_certs.end(),bind1st(_addcert(),x509Data));
+        for_each(m_resolver->getCertificates().begin(),m_resolver->getCertificates().end(),bind1st(_addcert(),x509Data));
         sig->setKeyInfo(keyInfo);
 
         // Sign while marshalling.
@@ -92,13 +93,14 @@ public:
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());
         
-        assertEquals(expectedChildElementsDOM, b->buildFromDocument(doc));
+        auto_ptr<XMLObject> assertion2(b->buildFromDocument(doc));
+        assertEquals("Unmarshalled assertion does not match", expectedChildElementsDOM, assertion2.get(), false);
         
         try {
             SignatureProfileValidator spv;
-            SignatureValidator sv(new KeyResolver(m_key->clone()));
-            spv.validate(assertion->getSignature());
-            sv.validate(assertion->getSignature());
+            SignatureValidator sv(new KeyResolver(m_resolver->getKey()));
+            spv.validate(dynamic_cast<Assertion*>(assertion2.get())->getSignature());
+            sv.validate(dynamic_cast<Assertion*>(assertion2.get())->getSignature());
         }
         catch (XMLToolingException& e) {
             TS_TRACE(e.what());