Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

[mech_eap.git] / util_mech.c

diff --git a/util_mech.c b/util_mech.c
index 35b1570..dd0c664 100644 (file)
--- a/util_mech.c
+++ b/util_mech.c
@@ -30,11 +30,15 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * General mechanism utility routines.
+ */
+
 #include "gssapiP_eap.h"
 
 /*
  * 1.3.6.1.4.1.5322(padl)
- *      gssEap(21)
+ *      gssEap(22)
  *       mechanisms(1)
  *        eap-aes128-cts-hmac-sha1-96(17)
  *        eap-aes256-cts-hmac-sha1-96(18)
@@ -49,18 +53,18 @@
 
 /*
  * Note: the enctype-less OID is used as the mechanism OID in exported
- * names. There is no exported symbol for it. This is consistent with
+ * names. There is no public symbol for it. This is consistent with
  * the krb5 mechanism which, whilst known by many OIDs, always uses a
  * canonical OID for exported names. (This OID is also returned by
  * gss_inquire_name.)
  */
 static gss_OID_desc gssEapMechOids[] = {
-    /* 1.3.6.1.4.1.5322.21.1  */
-    { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01" },
-    /* 1.3.6.1.4.1.5322.21.1.17 */
-    { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x11" },
-    /* 1.3.6.1.4.1.5322.21.1.18 */
-    { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x12" }
+    /* 1.3.6.1.4.1.5322.22.1  */
+    { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01" },
+    /* 1.3.6.1.4.1.5322.22.1.17 */
+    { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x11" },
+    /* 1.3.6.1.4.1.5322.22.1.18 */
+    { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x12" }
 };
 
 gss_OID GSS_EAP_MECHANISM                            = &gssEapMechOids[0];
@@ -105,8 +109,10 @@ gssEapValidateMechs(OM_uint32 *minor,
     for (i = 0; i < mechs->count; i++) {
         gss_OID oid = &mechs->elements[i];
 
-        if (!gssEapIsConcreteMechanismOid(oid))
+        if (!gssEapIsConcreteMechanismOid(oid)) {
+            *minor = GSSEAP_WRONG_MECH;
             return GSS_S_BAD_MECH;
+        }
     }
 
     return GSS_S_COMPLETE;