Sync up constants.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@2986 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/.cproject b/.cproject
index 68d69c0..374c971 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -25,6 +25,7 @@
 <pathentry base-path="cpp-opensaml2" include="" kind="inc" path="" system="true"/>\r
 <pathentry base-path="cpp-sp" include="shibsp" kind="inc" path="" system="true"/>\r
 <pathentry base-path="cpp-sp" include="" kind="inc" path="" system="true"/>\r
+<pathentry kind="mac" name="SHIBSP_API" path="" value=""/>\r
 <pathentry kind="out" path=""/>\r
 <pathentry excluding="util/|impl/|security/|metadata/|remoting/|remoting/impl/|attribute/|binding/|binding/impl/|attribute/resolver/|attribute/resolver/impl/|handler/|handler/impl/|attribute/filtering/|attribute/filtering/impl/|lite/" kind="src" path="shibsp"/>\r
 <pathentry excluding="resolver/|resolver/impl/|filtering/|filtering/impl/" kind="src" path="shibsp/attribute"/>\r

diff --git a/shibsp/lite/SAMLConstants.cpp b/shibsp/lite/SAMLConstants.cpp
index 5c2be15..59f8e8b 100644 (file)
--- a/shibsp/lite/SAMLConstants.cpp
+++ b/shibsp/lite/SAMLConstants.cpp
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2007 Internet2
- * 
+ *  Copyright 2001-2009 Internet2
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,8 +16,8 @@
 
 /**
  * SAMLConstants.cpp
- * 
- * SAML XML namespace constants 
+ *
+ * SAML XML namespace constants
  */
 
 
@@ -184,6 +184,36 @@ const XMLCh samlconstants::SAML20P_THIRDPARTY_EXT_NS[] = // urn:oasis:names:tc:S
 
 const XMLCh samlconstants::SAML20P_THIRDPARTY_EXT_PREFIX[] = UNICODE_LITERAL_6(t,h,r,p,t,y);
 
+const XMLCh samlconstants::SAML20_ATTRIBUTE_EXT_NS[] = // urn:oasis:names:tc:SAML:attribute:ext
+{ chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
+  chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
+  chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,
+  chLatin_a, chLatin_t, chLatin_t, chLatin_r, chLatin_i, chLatin_b, chLatin_u, chLatin_t, chLatin_e, chColon,
+  chLatin_e, chLatin_x, chLatin_t, chNull
+};
+
+const XMLCh samlconstants::SAML20_ATTRIBUTE_EXT_PREFIX[] = UNICODE_LITERAL_3(e,x,t);
+
+const XMLCh samlconstants::SAML20MD_ENTITY_ATTRIBUTE_NS[] = // urn:oasis:names:tc:SAML:metadata:attribute
+{ chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
+  chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
+  chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon,
+  chLatin_m, chLatin_e, chLatin_t, chLatin_a, chLatin_d, chLatin_a, chLatin_t, chLatin_a, chColon,
+  chLatin_a, chLatin_t, chLatin_t, chLatin_r, chLatin_i, chLatin_b, chLatin_u, chLatin_t, chLatin_e, chNull
+};
+
+const XMLCh samlconstants::SAML20MD_ENTITY_ATTRIBUTE_PREFIX[] = UNICODE_LITERAL_6(m,d,a,t,t,r);
+
+const XMLCh samlconstants::SAML20_DELEGATION_CONDITION_NS[] = // urn:oasis:names:tc:SAML:2.0:conditions:delegation
+{ chLatin_u, chLatin_r, chLatin_n, chColon, chLatin_o, chLatin_a, chLatin_s, chLatin_i, chLatin_s, chColon,
+  chLatin_n, chLatin_a, chLatin_m, chLatin_e, chLatin_s, chColon, chLatin_t, chLatin_c, chColon,
+  chLatin_S, chLatin_A, chLatin_M, chLatin_L, chColon, chDigit_2, chPeriod, chDigit_0, chColon,
+  chLatin_c, chLatin_o, chLatin_n, chLatin_d, chLatin_i, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chLatin_s, chColon,
+  chLatin_d, chLatin_e, chLatin_l, chLatin_e, chLatin_g, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
+};
+
+const XMLCh samlconstants::SAML20_DELEGATION_CONDITION_PREFIX[] = UNICODE_LITERAL_3(d,e,l);
+
 const char samlconstants::SAML1_BINDING_SOAP[] = "urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding";
 
 const char samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT[] = "urn:oasis:names:tc:SAML:1.0:profiles:artifact-01";

diff --git a/shibsp/lite/SAMLConstants.h b/shibsp/lite/SAMLConstants.h
index 74e0004..f04b3f3 100644 (file)
--- a/shibsp/lite/SAMLConstants.h
+++ b/shibsp/lite/SAMLConstants.h
@@ -1,6 +1,6 @@
 /*
- *  Copyright 2001-2007 Internet2
- * 
+ *  Copyright 2001-2009 Internet2
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -16,8 +16,8 @@
 
 /**
  * @file shibsp/lite/SAMLConstants.h
- * 
- * SAML XML namespace constants 
+ *
+ * SAML XML namespace constants
  */
 
 #ifndef __shibsp_xmlconstants_h__
@@ -29,10 +29,10 @@
  * SAML related constants.
  */
 namespace samlconstants {
-    
+
     /**  Liberty PAOS XML Namespace ("urn:liberty:paos:2003-08") */
     extern SHIBSP_API const XMLCh PAOS_NS[];
-    
+
     /**  Liberty PAOS QName prefix ("paos") */
     extern SHIBSP_API const XMLCh PAOS_PREFIX[];
 
@@ -41,16 +41,16 @@ namespace samlconstants {
 
     /**  SAML 1.X Protocol XML namespace ("urn:oasis:names:tc:SAML:1.0:protocol") */
     extern SHIBSP_API const XMLCh SAML1P_NS[];
-    
+
     /** SAML 1.X Assertion QName prefix ("saml") */
     extern SHIBSP_API const XMLCh SAML1_PREFIX[];
 
     /** SAML 1.X Protocol QName prefix ("samlp") */
     extern SHIBSP_API const XMLCh SAML1P_PREFIX[];
-    
+
     /**  SAML 2.0 Version ("2.0") */
     extern SHIBSP_API const XMLCh SAML20_VERSION[];
-    
+
     /**  SAML 2.0 Assertion XML namespace ("urn:oasis:names:tc:SAML:2.0:assertion") */
     extern SHIBSP_API const XMLCh SAML20_NS[];
 
@@ -62,7 +62,7 @@ namespace samlconstants {
 
     /**  SAML 2.0 AuthnContext XML namespace ("urn:oasis:names:tc:SAML:2.0:ac") */
     extern SHIBSP_API const XMLCh SAML20AC_NS[];
-    
+
     /** SAML 2.0 Assertion QName prefix ("saml") */
     extern SHIBSP_API const XMLCh SAML20_PREFIX[];
 
@@ -77,52 +77,70 @@ namespace samlconstants {
 
     /** SAML 2.0 Enhanced Client/Proxy SSO Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp") */
     extern SHIBSP_API const XMLCh SAML20ECP_NS[];
-    
+
     /** SAML 2.0 Enhanced Client/Proxy SSO Profile QName prefix ("ecp") */
     extern SHIBSP_API const XMLCh SAML20ECP_PREFIX[];
 
     /** SAML 2.0 DCE PAC Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE") */
     extern SHIBSP_API const XMLCh SAML20DCE_NS[];
-    
+
     /** SAML 2.0 DCE PAC Attribute Profile QName prefix ("DCE") */
     extern SHIBSP_API const XMLCh SAML20DCE_PREFIX[];
 
     /** SAML 2.0 X.500 Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:X500") */
     extern SHIBSP_API const XMLCh SAML20X500_NS[];
-    
+
     /** SAML 2.0 X.500 Attribute Profile QName prefix ("x500") */
     extern SHIBSP_API const XMLCh SAML20X500_PREFIX[];
 
     /** SAML 2.0 XACML Attribute Profile XML Namespace ("urn:oasis:names:tc:SAML:2.0:profiles:attribute:XACML") */
     extern SHIBSP_API const XMLCh SAML20XACML_NS[];
-    
+
     /** SAML 2.0 XACML Attribute Profile QName prefix ("xacmlprof") */
     extern SHIBSP_API const XMLCh SAML20XACML_PREFIX[];
 
     /** SAML 1.x Metadata Profile XML Namespace ("urn:oasis:names:tc:SAML:profiles:v1metadata") */
     extern SHIBSP_API const XMLCh SAML1MD_NS[];
-    
+
     /** SAML 1.x Metadata Profile QName prefix ("saml1md") */
     extern SHIBSP_API const XMLCh SAML1MD_PREFIX[];
 
     /** SAML 1.0 Protocol Enumeration constant ("urn:oasis:names:tc:SAML:1.0:protocol") */
     extern SHIBSP_API const XMLCh SAML10_PROTOCOL_ENUM[];
-    
+
     /** SAML 1.1 Protocol Enumeration constant ("urn:oasis:names:tc:SAML:1.1:protocol") */
     extern SHIBSP_API const XMLCh SAML11_PROTOCOL_ENUM[];
 
     /** SAML Query Requester Metadata Extension XML Namespace ("urn:oasis:names:tc:SAML:metadata:ext:query") */
     extern SHIBSP_API const XMLCh SAML20MD_QUERY_EXT_NS[];
-    
+
     /** SAML Query Requester Metadata Extension QName prefix ("query") */
     extern SHIBSP_API const XMLCh SAML20MD_QUERY_EXT_PREFIX[];
 
     /** SAML Third-Party Request Protocol Extension XML Namespace ("urn:oasis:names:tc:SAML:protocol:ext:third-party") */
     extern SHIBSP_API const XMLCh SAML20P_THIRDPARTY_EXT_NS[];
-    
-    /** SAML Third-Party Request Protocol Extension QName prefix ("query") */
+
+    /** SAML Third-Party Request Protocol Extension QName prefix ("thrpty") */
     extern SHIBSP_API const XMLCh SAML20P_THIRDPARTY_EXT_PREFIX[];
 
+    /** SAML Attribute Extension XML Namespace ("urn:oasis:names:tc:SAML:attribute:ext") */
+    extern SHIBSP_API const XMLCh SAML20_ATTRIBUTE_EXT_NS[];
+
+    /** SAML Attribute Extension QName prefix ("ext") */
+    extern SHIBSP_API const XMLCh SAML20_ATTRIBUTE_EXT_PREFIX[];
+
+    /** SAML Metadata Extension for Entity Attributes XML Namespace ("urn:oasis:names:tc:SAML:metadata:attribute") */
+    extern SHIBSP_API const XMLCh SAML20MD_ENTITY_ATTRIBUTE_NS[];
+
+    /** SAML Metadata Extension for Entity Attributes QName prefix ("mdattr") */
+    extern SHIBSP_API const XMLCh SAML20MD_ENTITY_ATTRIBUTE_PREFIX[];
+
+    /** SAML Condition for Delegation Restriction XML Namespace ("urn:oasis:names:tc:SAML:2.0:conditions:delegation") */
+    extern SHIBSP_API const XMLCh SAML20_DELEGATION_CONDITION_NS[];
+
+    /** SAML Condition for Delegation Restriction QName prefix ("del") */
+    extern SHIBSP_API const XMLCh SAML20_DELEGATION_CONDITION_PREFIX[];
+
     /** SAML 1.x SOAP binding ("urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding") */
     extern SHIBSP_API const char SAML1_BINDING_SOAP[];
 
@@ -131,11 +149,11 @@ namespace samlconstants {
 
     /** SAML 1.x Browser POST profile ("urn:oasis:names:tc:SAML:1.0:profiles:browser-post") */
     extern SHIBSP_API const char SAML1_PROFILE_BROWSER_POST[];
-    
+
     /** SAML 2.0 SOAP binding ("urn:oasis:names:tc:SAML:2.0:bindings:SOAP") */
     extern SHIBSP_API const char SAML20_BINDING_SOAP[];
 
-    /** SAML 2.0 SOAP binding ("urn:oasis:names:tc:SAML:2.0:bindings:PAOS") */
+    /** SAML 2.0 PAOS binding ("urn:oasis:names:tc:SAML:2.0:bindings:PAOS") */
     extern SHIBSP_API const char SAML20_BINDING_PAOS[];
 
     /** SAML 2.0 URI binding ("urn:oasis:names:tc:SAML:2.0:bindings:URI") */
@@ -146,13 +164,13 @@ namespace samlconstants {
 
     /** SAML 2.0 HTTP-POST binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST") */
     extern SHIBSP_API const char SAML20_BINDING_HTTP_POST[];
-    
+
     /** SAML 2.0 HTTP-POST-SimpleSign binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign") */
     extern SHIBSP_API const char SAML20_BINDING_HTTP_POST_SIMPLESIGN[];
 
     /** SAML 2.0 HTTP-Redirect binding ("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect") */
     extern SHIBSP_API const char SAML20_BINDING_HTTP_REDIRECT[];
-    
+
     /** SAML 2.0 HTTP-Redirect DEFLATE URL encoding ("urn:oasis:names:tc:SAML:2.0:bindings:URL-Encoding:DEFLATE") */
     extern SHIBSP_API const char SAML20_BINDING_URL_ENCODING_DEFLATE[];
 };