X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FEncryptionTest.h;h=6573d4c7c9872f67ce940e8be9e4fdf23213d9eb;hb=a0d768778a8f5f539b909baf5b115e70ea765f0f;hp=4f6f0b5fa08bb6251335c7fd0c853d27f0d2b60f;hpb=ce4b4a22812fef63619154a8e9b12dd44a2cbb5e;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/EncryptionTest.h b/xmltoolingtest/EncryptionTest.h
index 4f6f0b5..6573d4c 100644
--- a/xmltoolingtest/EncryptionTest.h
+++ b/xmltoolingtest/EncryptionTest.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,9 @@
 
 #include <xmltooling/encryption/Decrypter.h>
 #include <xmltooling/encryption/Encrypter.h>
+#include <xmltooling/encryption/Encryption.h>
+#include <xmltooling/security/Credential.h>
+#include <xmltooling/security/CredentialCriteria.h>
 #include <xmltooling/security/CredentialResolver.h>
 
 #include <fstream>
@@ -26,21 +29,11 @@
 
 using namespace xmlencryption;
 
-class _addcert : public std::binary_function<X509Data*,XSECCryptoX509*,void> {
-public:
-    void operator()(X509Data* bag, XSECCryptoX509* cert) const {
-        safeBuffer& buf=cert->getDEREncodingSB();
-        X509Certificate* x=X509CertificateBuilder::buildX509Certificate();
-        x->setValue(buf.sbStrToXMLCh());
-        bag->getX509Certificates().push_back(x);
-    }
-};
-
 class EncryptionTest : public CxxTest::TestSuite {
     CredentialResolver* m_resolver;
 public:
     void setUp() {
-        m_resolver=NULL;
+        m_resolver=nullptr;
         string config = data_path + "FilesystemCredentialResolver.xml";
         ifstream in(config.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
@@ -48,9 +41,11 @@ public:
         m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
             FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
             );
+        XMLObjectBuilder::registerDefaultBuilder(new UnknownElementBuilder());
     }
 
     void tearDown() {
+        XMLObjectBuilder::deregisterDefaultBuilder();
         delete m_resolver;
     }
 
@@ -58,17 +53,23 @@ public:
         string path=data_path + "ComplexXMLObject.xml";
         ifstream fs(path.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);
-        TS_ASSERT(doc!=NULL);
+        TS_ASSERT(doc!=nullptr);
 
         try {
+            CredentialCriteria cc;
+            cc.setUsage(Credential::ENCRYPTION_CREDENTIAL);
             Locker locker(m_resolver);
+            const Credential* cred=m_resolver->resolve(&cc);
+            TSM_ASSERT("Retrieved credential was null", cred!=nullptr);
+
             Encrypter encrypter;
             Encrypter::EncryptionParams ep;
-            Encrypter::KeyEncryptionParams kep(DSIGConstants::s_unicodeStrURIRSA_1_5,m_resolver->getKey());
+            Encrypter::KeyEncryptionParams kep(*cred);
             auto_ptr<EncryptedData> encData(encrypter.encryptElement(doc->getDocumentElement(),ep,&kep));
 
             string buf;
             XMLHelper::serialize(encData->marshall(), buf);
+            //TS_TRACE(buf.c_str());
             istringstream is(buf);
             DOMDocument* doc2=XMLToolingConfig::getConfig().getValidatingParser().parse(is);
             auto_ptr<EncryptedData> encData2(