projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged trust engines back into a unified version, made metadata roles a "KeyInfoSource".
[shibboleth/cpp-opensaml.git]
/
samltest
/
binding.h
diff --git
a/samltest/binding.h
b/samltest/binding.h
index
13638f1
..
b412be8
100644
(file)
--- a/
samltest/binding.h
+++ b/
samltest/binding.h
@@
-22,10
+22,11
@@
#include <saml/binding/MessageDecoder.h>
\r
#include <saml/binding/MessageEncoder.h>
\r
#include <saml/binding/URLEncoder.h>
\r
#include <saml/binding/MessageDecoder.h>
\r
#include <saml/binding/MessageEncoder.h>
\r
#include <saml/binding/URLEncoder.h>
\r
+#include <saml/saml2/metadata/Metadata.h>
\r
#include <saml/saml2/metadata/MetadataProvider.h>
\r
#include <saml/saml2/metadata/MetadataProvider.h>
\r
-#include <
saml
/security/TrustEngine.h>
\r
+#include <
xmltooling
/security/TrustEngine.h>
\r
\r
\r
-using namespace saml2md;
\r
+using namespace
opensaml::
saml2md;
\r
using namespace xmlsignature;
\r
\r
class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
\r
using namespace xmlsignature;
\r
\r
class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
\r
@@
-33,7
+34,7
@@
class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse
protected:
\r
CredentialResolver* m_creds;
\r
MetadataProvider* m_metadata;
\r
protected:
\r
CredentialResolver* m_creds;
\r
MetadataProvider* m_metadata;
\r
-
opensaml::
TrustEngine* m_trust;
\r
+ TrustEngine* m_trust;
\r
map<string,string> m_fields;
\r
map<string,string> m_headers;
\r
string m_method,m_url,m_query;
\r
map<string,string> m_fields;
\r
map<string,string> m_headers;
\r
string m_method,m_url,m_query;
\r
@@
-75,7
+76,7
@@
public:
FILESYSTEM_CREDENTIAL_RESOLVER,doc2->getDocumentElement()
\r
);
\r
\r
FILESYSTEM_CREDENTIAL_RESOLVER,doc2->getDocumentElement()
\r
);
\r
\r
- m_trust =
SAMLConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_SAML
TRUSTENGINE, NULL);
\r
+ m_trust =
XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_
TRUSTENGINE, NULL);
\r
\r
m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));
\r
m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));
\r
\r
m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));
\r
m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));
\r