Message rules no longer protocol specific.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-opensaml2/trunk@291 fb386ef7-a10c-0410-8ebf-fd3f8e989ab0

diff --git a/saml/saml1/binding/impl/SAML1MessageRule.cpp b/saml/saml1/binding/impl/SAML1MessageRule.cpp
index c9604c7..309f175 100644 (file)
--- a/saml/saml1/binding/impl/SAML1MessageRule.cpp
+++ b/saml/saml1/binding/impl/SAML1MessageRule.cpp
@@ -64,10 +64,7 @@ void SAML1MessageRule::evaluate(
     const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy
     ) const
 {
-    // Only handle SAML 1.x protocol and SAML 1.x messages.
-    if (!XMLString::equals(protocol, samlconstants::SAML11_PROTOCOL_ENUM) &&
-        !XMLString::equals(protocol, samlconstants::SAML10_PROTOCOL_ENUM))
-        return;
+    // Only handle SAML 1.x messages.
     const QName& q = message.getElementQName();
     if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1P_NS) &&
         !XMLString::equals(q.getNamespaceURI(), samlconstants::SAML1_NS))

diff --git a/saml/saml2/binding/impl/SAML2MessageRule.cpp b/saml/saml2/binding/impl/SAML2MessageRule.cpp
index 1c921f4..39dca01 100644 (file)
--- a/saml/saml2/binding/impl/SAML2MessageRule.cpp
+++ b/saml/saml2/binding/impl/SAML2MessageRule.cpp
@@ -61,9 +61,7 @@ void SAML2MessageRule::evaluate(
     const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy
     ) const
 {
-    // Only handle SAML 2.0 protocol and 2.0 messages.
-    if (!XMLString::equals(protocol, samlconstants::SAML20P_NS))
-        return;
+    // Only handle SAML 2.0 messages.
     const QName& q = message.getElementQName();
     if (!XMLString::equals(q.getNamespaceURI(), samlconstants::SAML20P_NS)&&
         !XMLString::equals(q.getNamespaceURI(), samlconstants::SAML20_NS))