From: Sam Hartman <hartmans@debian.org>
Date: Fri, 14 Sep 2012 17:53:34 +0000 (-0400)
Subject: Update name OIDs
X-Git-Tag: 0.9.2~70
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=a74ad3b7b176ad762a25f1a6e7105f34b7183442;p=mech_eap.git

Update name OIDs

Add comment on where OIDs come from and update oid for EAP name type.
---

diff --git a/mech_eap/util_mech.c b/mech_eap/util_mech.c
index 86f63f9..3e65c1e 100644
--- a/mech_eap/util_mech.c
+++ b/mech_eap/util_mech.c
@@ -37,18 +37,21 @@
 #include "gssapiP_eap.h"
 
 /*
- * 1.3.6.1.4.1.5322(padl)
+ * Many OIDs are taken from 1.3.6.1.4.1.5322(padl)
  *      gssEap(22)
- *       mechanisms(1)
+ *       mechanisms(1) (no longer used)
  *        eap-aes128-cts-hmac-sha1-96(17)
  *        eap-aes256-cts-hmac-sha1-96(18)
- *       nameTypes(2)
+ *       nameTypes(2) (no longer used)
  *       apiExtensions(3)
  *        inquireSecContextByOid(1)
  *        inquireCredByOid(2)
  *        setSecContextOption(3)
  *        setCredOption(4)
  *        mechInvoke(5)
+ *        Mechanisms and name types are now taken from
+ *      http://www.iana.org/assignments/smi-numbers . See Prefix:
+ *      iso.org.dod.internet.security.mechanisms.abfab (1.3.6.1.5.5.15)
  */
 
 /*
diff --git a/mech_eap/util_name.c b/mech_eap/util_name.c
index 6045724..0b9c23b 100644
--- a/mech_eap/util_name.c
+++ b/mech_eap/util_name.c
@@ -61,7 +61,7 @@
 
 static gss_OID_desc gssEapNtEapName = {
     /* 1.3.6.1.4.1.5322.22.2.1  */
-    10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x02\x01"
+    8, "\x2B\x06\x01\x05\x05\x0f\x02\x01"
 };
 
 gss_OID GSS_EAP_NT_EAP_NAME = &gssEapNtEapName;