* 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" }
};
gss_OID GSS_EAP_MECHANISM = &gssEapConcreteMechs[0];
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 (oid == GSS_C_NO_OID) {
- return TRUE;
- } else 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
int suffix;
major = decomposeOid(minor,
- gssEapMechPrefix.elements,
- gssEapMechPrefix.length,
+ GSS_EAP_MECHANISM->elements,
+ GSS_EAP_MECHANISM->length,
oid,
&suffix);
if (major == GSS_S_COMPLETE)
return GSS_S_FAILURE;
}
- oid->elements = GSSEAP_MALLOC(gssEapMechPrefix.length + 1);
+ oid->length = GSS_EAP_MECHANISM->length + 1;
+ oid->elements = GSSEAP_MALLOC(oid->length);
if (oid->elements == NULL) {
*minor = ENOMEM;
- free(oid);
+ GSSEAP_FREE(oid);
return GSS_S_FAILURE;
}
major = composeOid(minor,
- gssEapMechPrefix.elements,
- gssEapMechPrefix.length,
+ GSS_EAP_MECHANISM->elements,
+ GSS_EAP_MECHANISM->length,
enctype,
oid);
if (major == GSS_S_COMPLETE) {
gssEapInternalizeOid(oid, pOid);
*pOid = oid;
} else {
- free(oid->elements);
- free(oid);
+ GSSEAP_FREE(oid->elements);
+ GSSEAP_FREE(oid);
}
return major;
GSSEAP_FREE(etypes); /* XXX */
+ *minor = 0;
return major;
}
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;
return GSS_S_COMPLETE;
}
-void
+int
gssEapInternalizeOid(const gss_OID oid,
gss_OID *const pInternalizedOid)
{
if (*pInternalizedOid == GSS_C_NO_OID) {
*pInternalizedOid = oid;
+ return 0;
}
+
+ return 1;
}