* mechInvoke(5)
*/
-static 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 gss_OID_desc gssEapConcreteMechs[] = {
+static gss_OID_desc gssEapMechOids[] = {
/* 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_AES128_CTS_HMAC_SHA1_96_MECHANISM = &gssEapConcreteMechs[1];
-gss_OID GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM = &gssEapConcreteMechs[2];
+gss_OID GSS_EAP_MECHANISM = &gssEapMechOids[0];
+gss_OID GSS_EAP_AES128_CTS_HMAC_SHA1_96_MECHANISM = &gssEapMechOids[1];
+gss_OID GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM = &gssEapMechOids[2];
int
-gssEapIsMechanismOid(const gss_OID oid)
+gssEapIsConcreteMechanismOid(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->length > GSS_EAP_MECHANISM->length &&
+ memcmp(oid->elements, GSS_EAP_MECHANISM->elements,
+ GSS_EAP_MECHANISM->length) == 0;
+}
- return FALSE;
+int
+gssEapIsMechanismOid(const gss_OID oid)
+{
+ return oid == GSS_C_NO_OID ||
+ oidEqual(oid, GSS_EAP_MECHANISM) ||
+ gssEapIsConcreteMechanismOid(oid);
}
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;
}
*pInternalizedOid = GSS_C_NO_OID;
for (i = 0;
- i < sizeof(gssEapConcreteMechs) / sizeof(gssEapConcreteMechs[0]);
+ i < sizeof(gssEapMechOids) / sizeof(gssEapMechOids[0]);
i++) {
- if (oidEqual(oid, &gssEapConcreteMechs[i])) {
- *pInternalizedOid = (const gss_OID)&gssEapConcreteMechs[i];
+ if (oidEqual(oid, &gssEapMechOids[i])) {
+ *pInternalizedOid = (const gss_OID)&gssEapMechOids[i];
break;
}
}
return 1;
}
+
+static gss_buffer_desc gssEapSaslMechs[] = {
+ { sizeof("GS2-EAP"), "GS2-EAP", },
+ { sizeof("GS2-EAP-AES128"), "GS2-EAP-AES128" },
+ { sizeof("GS2-EAP-AES256"), "GS2-EAP-AES256" },
+};
+
+gss_buffer_t
+gssEapOidToSaslName(const gss_OID oid)
+{
+ size_t i;
+
+ for (i = 0; i < sizeof(gssEapMechOids)/sizeof(gssEapMechOids[0]); i++) {
+ if (oidEqual(&gssEapMechOids[i], oid))
+ return &gssEapSaslMechs[i];
+ }
+
+ return GSS_C_NO_BUFFER;
+}
+
+gss_OID
+gssEapSaslNameToOid(const gss_buffer_t name)
+{
+ size_t i;
+
+ for (i = 0; i < sizeof(gssEapSaslMechs)/sizeof(gssEapSaslMechs[0]); i++) {
+ if (bufferEqual(&gssEapSaslMechs[i], name))
+ return &gssEapMechOids[i];
+ }
+
+ return GSS_C_NO_OID;
+}