Multi-line svn commit, see body.

[shibboleth/cpp-opensaml.git] / saml / binding / impl / ClientCertAuthRule.cpp

diff --git a/saml/binding/impl/ClientCertAuthRule.cpp b/saml/binding/impl/ClientCertAuthRule.cpp
index f736092..8c30310 100644 (file)
--- a/saml/binding/impl/ClientCertAuthRule.cpp
+++ b/saml/binding/impl/ClientCertAuthRule.cpp
@@ -47,7 +47,7 @@ namespace opensaml {
         const char* getType() const {
             return CLIENTCERTAUTH_POLICY_RULE;
         }
-        void evaluate(const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy) const;
+        void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
     };
 
     SecurityPolicyRule* SAML_DLLLOCAL ClientCertAuthRuleFactory(const DOMElement* const & e)
@@ -56,9 +56,7 @@ namespace opensaml {
     }
 };
 
-void ClientCertAuthRule::evaluate(
-    const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy
-    ) const
+void ClientCertAuthRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
 {
     Category& log=Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.ClientCertAuth");
     
@@ -84,7 +82,7 @@ void ClientCertAuthRule::evaluate(
     MetadataCredentialCriteria cc(*(policy.getIssuerMetadata()));
     auto_ptr_char pn(policy.getIssuer()->getName());
     cc.setPeerName(pn.get());
-    cc.setUsage(CredentialCriteria::TLS_CREDENTIAL);
+    cc.setUsage(Credential::TLS_CREDENTIAL);
 
     if (!x509trust->validate(chain.front(), chain, *(policy.getMetadataProvider()), &cc)) {
         log.error("unable to verify certificate chain with supplied trust engine");
@@ -92,5 +90,5 @@ void ClientCertAuthRule::evaluate(
     }
     
     log.debug("client certificate verified against message issuer");
-    policy.setSecure(true);
+    policy.setAuthenticated(true);
 }