* mechInvoke(5)
*/
-/*
- * Prefix for GSS EAP mechanisms. A Kerberos encryption type is
- * concatenated with this to form a concrete mechanism OID.
- */
-static const gss_OID_desc gssEapMechPrefix = {
- /* 1.3.6.1.4.1.5322.21.1 */
- 11, "\x06\x09\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01"
+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"
};
-const gss_OID_desc *const gss_mech_eap = &gssEapMechPrefix;
-
-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" },
/* 1.3.6.1.4.1.5322.21.1.17 */
{ 12, "\x06\x0A\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" }
};
-const gss_OID_desc *const gss_mech_eap_aes128_cts_hmac_sha1_96 =
- &gssEapConcreteMechs[0];
-const gss_OID_desc *const gss_mech_eap_aes256_cts_hmac_sha1_96 =
- &gssEapConcreteMechs[1];
+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 > gssEapMechPrefix.length &&
+ memcmp(oid->elements, gssEapMechPrefix.elements,
+ gssEapMechPrefix.length) == 0;
+}
+
+int
+gssEapIsMechanismOid(const gss_OID oid)
+{
+ 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 GSS_S_COMPLETE;
+}
OM_uint32
gssEapOidToEnctype(OM_uint32 *minor,
return GSS_S_FAILURE;
}
- oid->elements = GSSEAP_MALLOC(gssEapMechPrefix.length + 2);
+ oid->elements = GSSEAP_MALLOC(gssEapMechPrefix.length + 1);
if (oid->elements == NULL) {
*minor = ENOMEM;
free(oid);
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;
}
for (i = 0; etypes[i] != ENCTYPE_NULL; i++) {
gss_OID mechOid;
+ /* XXX currently we aren't equipped to encode these enctypes */
+ if (etypes[i] < 0 || etypes[i] > 127)
+ continue;
+
major = gssEapEnctypeToOid(minor, etypes[i], &mechOid);
if (GSS_ERROR(major))
break;
}
GSSEAP_FREE(etypes); /* XXX */
- krb5_free_context(context);
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)
{
*pInternalizedOid = GSS_C_NO_OID;
- if (oidEqual(oid, &gssEapMechPrefix)) {
- *pInternalizedOid = (const gss_OID)&gssEapMechPrefix;
- } else {
- for (i = 0;
- i < sizeof(gssEapConcreteMechs) / sizeof(gssEapConcreteMechs[0]);
- i++) {
- if (oidEqual(oid, &gssEapConcreteMechs[i])) {
- *pInternalizedOid = (const gss_OID)&gssEapConcreteMechs[i];
- break;
- }
+ for (i = 0;
+ i < sizeof(gssEapConcreteMechs) / sizeof(gssEapConcreteMechs[0]);
+ i++) {
+ if (oidEqual(oid, &gssEapConcreteMechs[i])) {
+ *pInternalizedOid = (const gss_OID)&gssEapConcreteMechs[i];
+ break;
}
}
if (*pInternalizedOid == GSS_C_NO_OID) {
+ if (oidEqual(oid, GSS_EAP_NT_PRINCIPAL_NAME))
+ *pInternalizedOid = (const gss_OID)GSS_EAP_NT_PRINCIPAL_NAME;
+ }
+
+ if (*pInternalizedOid == GSS_C_NO_OID) {
*pInternalizedOid = oid;
+ return 0;
}
+
+ return 1;
}