X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fbinding%2FClientCertAuthRule.h;h=e878c48ee931c7b5a19cc41549e9c3df1e8d01f3;hb=932cfaae2176c2eba1a9938dc420591a9551a7f3;hp=154d27b775511ddf766e2579c9b201ae0e3ce3a0;hpb=f753e2293ab6a40575bc9b294490e134eac5db9e;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/binding/ClientCertAuthRule.h b/saml/binding/ClientCertAuthRule.h
index 154d27b..e878c48 100644
--- a/saml/binding/ClientCertAuthRule.h
+++ b/saml/binding/ClientCertAuthRule.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,9 @@
  * TLS client authentication SecurityPolicyRule
  */
 
+#ifndef __saml_certrule_h__
+#define __saml_certrule_h__
+
 #include <saml/binding/SecurityPolicyRule.h>
 
 
@@ -33,26 +36,8 @@ namespace opensaml {
         ClientCertAuthRule(const DOMElement* e) {}
         virtual ~ClientCertAuthRule() {}
         
-        std::pair<saml2::Issuer*,const saml2md::RoleDescriptor*> evaluate(
-            const GenericRequest& request,
-            const xmltooling::XMLObject& message,
-            const saml2md::MetadataProvider* metadataProvider,
-            const xmltooling::QName* role,
-            const TrustEngine* trustEngine
-            ) const;
-
-    protected:
-        /**
-         * Examines the message and/or its contents and extracts the issuer's claimed
-         * identity along with a protocol identifier. The two together can be used to
-         * locate metadata to use in validating the signature. Conventions may be needed
-         * to properly encode non-SAML2 issuer information into a compatible form. 
-         * 
-         * <p>The caller is responsible for freeing the Issuer object.
-         * 
-         * @param message       message to examine
-         * @return  a pair consisting of a SAML 2.0 Issuer object and a protocol constant.
-         */
-        virtual std::pair<saml2::Issuer*,const XMLCh*> getIssuerAndProtocol(const xmltooling::XMLObject& message) const;
+        void evaluate(const xmltooling::XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
     };
 };
+
+#endif /* __saml_certrule_h__ */