Update to gss-eap-naming-04

Update attribute prefixes used to draft-ietf-abfab-gss-eap-naming-04.

diff --git a/mech_eap/README.samba4 b/mech_eap/README.samba4
index e1e19fe..b565a79 100644 (file)
--- a/mech_eap/README.samba4
+++ b/mech_eap/README.samba4
@@ -16,7 +16,7 @@ Shibboleth
 * Add a mapping from the PAC RADIUS attribute to urn:mspac: in the file
   /usr/local/etc/shibboleth/attribute-map.xml:
 
-  <GSSAPIAttribute name="urn:ietf:params:gssapi:aaa-radius 26.25622.133"
+  <GSSAPIAttribute name="urn:ietf:params:gss:radius-attribute 26.25622.133"
    id="urn:mspac:" binary="true"/>
 
 FreeRADIUS

diff --git a/mech_eap/util_radius.cpp b/mech_eap/util_radius.cpp
index e152cd2..8a1edd5 100644 (file)
--- a/mech_eap/util_radius.cpp
+++ b/mech_eap/util_radius.cpp
@@ -822,7 +822,7 @@ gss_eap_radius_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx,
 const char *
 gss_eap_radius_attr_provider::prefix(void) const
 {
-    return "urn:ietf:params:gssapi:aaa-radius";
+    return "urn:ietf:params:gss:radius-attribute";
 }
 
 JSONObject

diff --git a/mech_eap/util_saml.cpp b/mech_eap/util_saml.cpp
index 72047cd..bf82a57 100644 (file)
--- a/mech_eap/util_saml.cpp
+++ b/mech_eap/util_saml.cpp
@@ -316,7 +316,7 @@ gss_eap_saml_assertion_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSE
 const char *
 gss_eap_saml_assertion_provider::prefix(void) const
 {
-    return "urn:ietf:params:gss-eap:saml-aaa-assertion";
+    return "urn:ietf:params:gss:federated-saml-assertion";
 }
 
 bool
@@ -413,7 +413,7 @@ gss_eap_saml_attr_provider::getAttributeTypes(gss_eap_attr_enumeration_cb addAtt
      *   Each attribute carried in the assertion SHOULD also be a GSS name
      *   attribute.  The name of this attribute has three parts, all separated
      *   by an ASCII space character.  The first part is
-     *   urn:ietf:params:gss-eap:saml-attr.  The second part is the URI for
+     *   urn:ietf:params:gss:federated-saml-attribute.  The second part is the URI for
      *   the SAML attribute name format.  The final part is the name of the
      *   SAML attribute.  If the mechanism performs an additional attribute
      *   query, the retrieved attributes SHOULD be GSS-API name attributes
@@ -729,7 +729,7 @@ gss_eap_saml_attr_provider::releaseAnyNameMapping(gss_buffer_t type_id GSSEAP_UN
 const char *
 gss_eap_saml_attr_provider::prefix(void) const
 {
-    return "urn:ietf:params:gss-eap:saml-attr";
+    return "urn:ietf:params:gss:federated-saml-attribute";
 }
 
 bool