From 89f50d22226d2f52059d9d6e08c4349f4771a1a1 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 10 Sep 2010 21:28:06 +0000 Subject: [PATCH] Sync up constants. --- shibsp/lite/SAMLConstants.cpp | 24 ++++++++++++++++++++++-- shibsp/lite/SAMLConstants.h | 16 ++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/shibsp/lite/SAMLConstants.cpp b/shibsp/lite/SAMLConstants.cpp index 59f8e8b..f90fcba 100644 --- a/shibsp/lite/SAMLConstants.cpp +++ b/shibsp/lite/SAMLConstants.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2009 Internet2 + * Copyright 2001-2010 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ /** * SAMLConstants.cpp * - * SAML XML namespace constants + * SAML XML namespace constants. */ @@ -194,6 +194,16 @@ const XMLCh samlconstants::SAML20_ATTRIBUTE_EXT_NS[] = // urn:oasis:names:tc:SAM const XMLCh samlconstants::SAML20_ATTRIBUTE_EXT_PREFIX[] = UNICODE_LITERAL_3(e,x,t); +const XMLCh samlconstants::SAML20MD_ALGSUPPORT_NS[] = // urn:oasis:names:tc:SAML:metadata:algsupport +{ 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_l, chLatin_g, chLatin_s, chLatin_u, chLatin_p, chLatin_p, chLatin_o, chLatin_r, chLatin_t, chNull +}; + +const XMLCh samlconstants::SAML20MD_ALGSUPPORT_PREFIX[] = UNICODE_LITERAL_3(a,l,g); + 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, @@ -204,6 +214,16 @@ const XMLCh samlconstants::SAML20MD_ENTITY_ATTRIBUTE_NS[] = // urn:oasis:names:t const XMLCh samlconstants::SAML20MD_ENTITY_ATTRIBUTE_PREFIX[] = UNICODE_LITERAL_6(m,d,a,t,t,r); +const XMLCh samlconstants::SAML20MD_UI_NS[] = // urn:oasis:names:tc:SAML:metadata:ui +{ 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_u, chLatin_i, chNull +}; + +const XMLCh samlconstants::SAML20MD_UI_PREFIX[] = UNICODE_LITERAL_4(m,d,u,i); + 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, diff --git a/shibsp/lite/SAMLConstants.h b/shibsp/lite/SAMLConstants.h index 83b4de9..57c18cb 100644 --- a/shibsp/lite/SAMLConstants.h +++ b/shibsp/lite/SAMLConstants.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2009 Internet2 + * Copyright 2001-2010 Internet2 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ /** * @file shibsp/lite/SAMLConstants.h * - * SAML XML namespace constants + * SAML XML namespace constants. */ #ifndef __shibsp_xmlconstants_h__ @@ -130,12 +130,24 @@ namespace samlconstants { /** SAML Attribute Extension QName prefix ("ext") */ extern SHIBSP_API const XMLCh SAML20_ATTRIBUTE_EXT_PREFIX[]; + /** SAML Metadata Extension for Algorithm Support XML Namespace ("urn:oasis:names:tc:SAML:metadata:algsupport") */ + extern SHIBSP_API const XMLCh SAML20MD_ALGSUPPORT_NS[]; + + /** SAML Metadata Extension for Algorithm Support QName prefix ("alg") */ + extern SHIBSP_API const XMLCh SAML20MD_ALGSUPPORT_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 Metadata Extension for Discovery and Login UI XML Namespace ("urn:oasis:names:tc:SAML:metadata:ui") */ + extern SHIBSP_API const XMLCh SAML20MD_UI_NS[]; + + /** SAML Metadata Extension for Discovery and Login UI QName prefix ("mdui") */ + extern SHIBSP_API const XMLCh SAML20MD_UI_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[]; -- 2.1.4