Replace custom code with CredentialResolver.

[shibboleth/cpp-opensaml.git] / samltest / signature / SAMLSignatureTestBase.h

diff --git a/samltest/signature/SAMLSignatureTestBase.h b/samltest/signature/SAMLSignatureTestBase.h
index 24a8873..d0ec194 100644 (file)
--- a/samltest/signature/SAMLSignatureTestBase.h
+++ b/samltest/signature/SAMLSignatureTestBase.h
@@ -16,15 +16,9 @@
 \r
 #include "internal.h"\r
 #include <saml/signature/SignatureProfileValidator.h>\r
-#include <xmltooling/signature/SignatureValidator.h>\r
-\r
 \r
-#include <openssl/pem.h>\r
-#include <xsec/enc/XSECKeyInfoResolverDefault.hpp>\r
-#include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>\r
-#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp>\r
-#include <xsec/enc/XSECCryptoException.hpp>\r
-#include <xsec/framework/XSECException.hpp>\r
+#include <xmltooling/signature/CredentialResolver.h>\r
+#include <xmltooling/signature/SignatureValidator.h>\r
 \r
 using namespace xmlsignature;\r
 \r
@@ -40,39 +34,22 @@ public:
 \r
 class SAMLSignatureTestBase : public SAMLObjectBaseTestCase {\r
 protected:\r
-    XSECCryptoKey* m_key;\r
-    vector<XSECCryptoX509*> m_certs;\r
+    CredentialResolver* m_resolver;\r
 public:\r
     void setUp() {\r
+        m_resolver=NULL;\r
         SAMLObjectBaseTestCase::setUp();\r
-        string keypath=data_path + "key.pem";\r
-        BIO* in=BIO_new(BIO_s_file_internal());\r
-        if (in && BIO_read_filename(in,keypath.c_str())>0) {\r
-            EVP_PKEY* pkey=PEM_read_bio_PrivateKey(in, NULL, NULL, NULL);\r
-            if (pkey) {\r
-                m_key=new OpenSSLCryptoKeyRSA(pkey);\r
-                EVP_PKEY_free(pkey);\r
-            }\r
-        }\r
-        if (in) BIO_free(in);\r
-        TS_ASSERT(m_key!=NULL);\r
-\r
-        string certpath=data_path + "cert.pem";\r
-        in=BIO_new(BIO_s_file_internal());\r
-        if (in && BIO_read_filename(in,certpath.c_str())>0) {\r
-            X509* x=NULL;\r
-            while (x=PEM_read_bio_X509(in,NULL,NULL,NULL)) {\r
-                m_certs.push_back(new OpenSSLCryptoX509(x));\r
-                X509_free(x);\r
-            }\r
-        }\r
-        if (in) BIO_free(in);\r
-        TS_ASSERT(m_certs.size()>0);\r
+        string config = data_path + "FilesystemCredentialResolver.xml";\r
+        ifstream in(config.c_str());\r
+        DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);\r
+        XercesJanitor<DOMDocument> janitor(doc);\r
+        m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(\r
+            FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()\r
+            );\r
     }\r
 \r
     void tearDown() {\r
+        delete m_resolver;\r
         SAMLObjectBaseTestCase::tearDown();\r
-        delete m_key;\r
-        for_each(m_certs.begin(),m_certs.end(),xmltooling::cleanup<XSECCryptoX509>());\r
     }\r
 };\r