fix some build errors

[mech_eap.orig] / util_mech.c

diff --git a/util_mech.c b/util_mech.c
index f4513e8..efeca2d 100644 (file)
--- a/util_mech.c
+++ b/util_mech.c
@@ -47,39 +47,55 @@
  *        mechInvoke(5)
  */
 
-static const gss_OID_desc gssEapMechPrefix = {
-    /* Note that alone this is not a valid DER encoded OID */
-    11, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x00"
-};
-
-static const gss_OID_desc gssEapConcreteMechs[] = {
+static gss_OID_desc gssEapConcreteMechs[] = {
     /* 1.3.6.1.4.1.5322.21.1  */
-    { 11, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01" },
+    { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01" },
     /* 1.3.6.1.4.1.5322.21.1.17 */
-    { 12, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x11" },
+    { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x11" },
     /* 1.3.6.1.4.1.5322.21.1.18 */
-    { 12, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x12" }
+    { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x12" }
 };
 
-const gss_OID_desc *const GSS_EAP_MECHANISM =
-    &gssEapConcreteMechs[0];
-const gss_OID_desc *const GSS_EAP_AES128_CTS_HMAC_SHA1_96_MECHANISM =
-    &gssEapConcreteMechs[1];
-const gss_OID_desc *const GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM =
-    &gssEapConcreteMechs[2];
+gss_OID GSS_EAP_MECHANISM                            = &gssEapConcreteMechs[0];
+gss_OID GSS_EAP_AES128_CTS_HMAC_SHA1_96_MECHANISM    = &gssEapConcreteMechs[1];
+gss_OID GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM    = &gssEapConcreteMechs[2];
+
+int
+gssEapIsConcreteMechanismOid(const gss_OID oid)
+{
+    return oid->length > GSS_EAP_MECHANISM->length &&
+           memcmp(oid->elements, GSS_EAP_MECHANISM->elements,
+                  GSS_EAP_MECHANISM->length) == 0;
+}
 
 int
 gssEapIsMechanismOid(const gss_OID oid)
 {
-    if (oidEqual(oid, GSS_EAP_MECHANISM)) {
-        return TRUE;
-    } else if (oid->length > gssEapMechPrefix.length &&
-               memcmp(oid->elements, gssEapMechPrefix.elements,
-                      gssEapMechPrefix.length) == 0) {
-        return TRUE;
+    return oid == GSS_C_NO_OID ||
+           oidEqual(oid, GSS_EAP_MECHANISM) ||
+           gssEapIsConcreteMechanismOid(oid);
+}
+
+OM_uint32
+gssEapValidateMechs(OM_uint32 *minor,
+                    const gss_OID_set mechs)
+{
+    int i;
+
+    *minor = 0;
+
+    if (mechs == GSS_C_NO_OID_SET) {
+        return GSS_S_COMPLETE;
+    }
+
+    for (i = 0; i < mechs->count; i++) {
+        gss_OID oid = &mechs->elements[i];
+
+        if (!gssEapIsMechanismOid(oid))
+            return GSS_S_BAD_MECH;
     }
 
-    return FALSE;
+    return GSS_S_COMPLETE;
 }
 
 OM_uint32
@@ -91,8 +107,8 @@ gssEapOidToEnctype(OM_uint32 *minor,
     int suffix;
 
     major = decomposeOid(minor,
-                         gssEapMechPrefix.elements,
-                         gssEapMechPrefix.length,
+                         GSS_EAP_MECHANISM->elements,
+                         GSS_EAP_MECHANISM->length,
                          oid,
                          &suffix);
     if (major == GSS_S_COMPLETE)
@@ -117,7 +133,7 @@ gssEapEnctypeToOid(OM_uint32 *minor,
         return GSS_S_FAILURE;
     }
 
-    oid->elements = GSSEAP_MALLOC(gssEapMechPrefix.length + 1);
+    oid->elements = GSSEAP_MALLOC(GSS_EAP_MECHANISM->length + 1);
     if (oid->elements == NULL) {
         *minor = ENOMEM;
         free(oid);
@@ -125,8 +141,8 @@ gssEapEnctypeToOid(OM_uint32 *minor,
     }
 
     major = composeOid(minor,
-                       gssEapMechPrefix.elements,
-                       gssEapMechPrefix.length,
+                       GSS_EAP_MECHANISM->elements,
+                       GSS_EAP_MECHANISM->length,
                        enctype,
                        oid);
     if (major == GSS_S_COMPLETE) {
@@ -144,25 +160,20 @@ OM_uint32
 gssEapIndicateMechs(OM_uint32 *minor,
                     gss_OID_set *mechs)
 {
-    krb5_context context;
+    krb5_context krbContext;
     OM_uint32 major, tmpMinor;
     krb5_enctype *etypes;
     int i;
 
-    *minor = krb5_init_context(&context);
-    if (*minor != 0) {
-        return GSS_S_FAILURE;
-    }
+    GSSEAP_KRB_INIT(&krbContext);
 
-    *minor = krb5_get_permitted_enctypes(context, &etypes);
+    *minor = krb5_get_permitted_enctypes(krbContext, &etypes);
     if (*minor != 0) {
-        krb5_free_context(context);
         return GSS_S_FAILURE;
     }
 
     major = gss_create_empty_oid_set(minor, mechs);
     if (GSS_ERROR(major)) {
-        krb5_free_context(context);
         GSSEAP_FREE(etypes); /* XXX */
         return major;
     }
@@ -186,7 +197,6 @@ gssEapIndicateMechs(OM_uint32 *minor,
     }
 
     GSSEAP_FREE(etypes); /* XXX */
-    krb5_free_context(context);
 
     return major;
 }
@@ -208,8 +218,7 @@ gssEapDefaultMech(OM_uint32 *minor,
         return GSS_S_BAD_MECH;
     }
 
-    gssEapInternalizeOid(&mechs->elements[0], oid);
-    if (*oid == &mechs->elements[0]) {
+    if (!gssEapInternalizeOid(&mechs->elements[0], oid)) {
         /* don't double-free if we didn't internalize it */
         mechs->elements[0].length = 0;
         mechs->elements[0].elements = NULL;
@@ -221,7 +230,7 @@ gssEapDefaultMech(OM_uint32 *minor,
     return GSS_S_COMPLETE;
 }
 
-void
+int
 gssEapInternalizeOid(const gss_OID oid,
                      gss_OID *const pInternalizedOid)
 {
@@ -245,5 +254,8 @@ gssEapInternalizeOid(const gss_OID oid,
 
     if (*pInternalizedOid == GSS_C_NO_OID) {
         *pInternalizedOid = oid;
+        return 0;
     }
+
+    return 1;
 }