/*
- * 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.
#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>
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);
m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
);
+ XMLObjectBuilder::registerDefaultBuilder(new UnknownElementBuilder());
}
void tearDown() {
+ XMLObjectBuilder::deregisterDefaultBuilder();
delete m_resolver;
}
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(