return GSS_S_COMPLETE;
}
-static krb5_error_code
-gssEapGetDefaultRealm(krb5_context krbContext, char **defaultRealm)
+static char *
+gssEapGetDefaultRealm(krb5_context krbContext)
{
- *defaultRealm = NULL;
+ char *defaultRealm = NULL;
krb5_appdefault_string(krbContext, "eap_gss",
- NULL, "default_realm", "", defaultRealm);
+ NULL, "default_realm", "", &defaultRealm);
- if (*defaultRealm != NULL && (*defaultRealm)[0] == '\0') {
- GSSEAP_FREE(*defaultRealm);
- *defaultRealm = NULL;
- }
-
- return (*defaultRealm != NULL) ? 0 : KRB5_CONFIG_NODEFREALM;
+ return defaultRealm;
}
static OM_uint32
host++;
}
- gssEapGetDefaultRealm(krbContext, &realm);
+ realm = gssEapGetDefaultRealm(krbContext);
code = krb5_build_principal(krbContext,
&krbPrinc,
/*
* Import an EAP name, possibly appending the default GSS EAP realm,
- * and taking care to avoid appending the default Kerberos realm.
*/
static OM_uint32
importEapNameFlags(OM_uint32 *minor,
krb5_context krbContext;
krb5_principal krbPrinc = NULL;
krb5_error_code code;
+ char *nameString;
GSSEAP_KRB_INIT(&krbContext);
if (nameBuffer == GSS_C_NO_BUFFER) {
- code = krb5_copy_principal(krbContext,
- krbAnonymousPrincipal(), &krbPrinc);
- if (code != 0) {
- *minor = code;
- return GSS_S_FAILURE;
- }
+ nameString = "";
+ code = KRB5_PARSE_MALFORMED;
} else {
- char *nameString;
-
major = bufferToString(minor, nameBuffer, &nameString);
if (GSS_ERROR(major))
return major;
/*
* First, attempt to parse the name on the assumption that it includes
- * a qualifying realm.
+ * a qualifying realm. This allows us to avoid accidentally appending
+ * the default Kerberos realm to an unqualified name. (A bug in MIT
+ * Kerberos prevents the default realm being set to an empty value.)
*/
code = krb5_parse_name_flags(krbContext, nameString,
KRB5_PRINCIPAL_PARSE_REQUIRE_REALM, &krbPrinc);
- if (code == KRB5_PARSE_MALFORMED) {
- char *defaultRealm = NULL;
- int parseFlags = 0;
-
- /*
- * We need an explicit appdefaults check because, at least with MIT
- * Kerberos, setting the context realm to NULL will reset it to the
- * default Kerberos realm after the second call to get_default_realm.
- * We want to make sure that the default Kerberos realm does not end
- * up accidentally appended to an unqualified name.
- */
- if (importFlags & IMPORT_FLAG_DEFAULT_REALM)
- gssEapGetDefaultRealm(krbContext, &defaultRealm);
-
- if (defaultRealm == NULL)
- parseFlags |= KRB5_PRINCIPAL_PARSE_NO_REALM;
-
- code = krb5_parse_name_flags(krbContext, nameString, parseFlags, &krbPrinc);
-
- if (defaultRealm != NULL)
- GSSEAP_FREE(defaultRealm);
+ }
+
+ if (code == KRB5_PARSE_MALFORMED) {
+ char *defaultRealm = NULL;
+ int parseFlags = 0;
+
+ /* Possibly append the default EAP realm if required */
+ if (importFlags & IMPORT_FLAG_DEFAULT_REALM)
+ defaultRealm = gssEapGetDefaultRealm(krbContext);
+
+ /* If no default realm, leave the realm empty in the parsed name */
+ if (defaultRealm == NULL || defaultRealm[0] == '\0')
+ parseFlags |= KRB5_PRINCIPAL_PARSE_NO_REALM;
+
+ code = krb5_parse_name_flags(krbContext, nameString, parseFlags, &krbPrinc);
+
+#ifdef HAVE_HEIMDAL_VERSION
+ if (code == 0 && KRB_PRINC_REALM(krbPrinc) == NULL) {
+ KRB_PRINC_REALM(krbPrinc) = GSSEAP_CALLOC(1, sizeof(char));
+ if (KRB_PRINC_REALM(krbPrinc) == NULL)
+ code = ENOMEM;
}
+#endif
+ if (defaultRealm != NULL)
+ GSSEAP_FREE(defaultRealm);
+ }
+
+ if (nameBuffer != GSS_C_NO_BUFFER)
GSSEAP_FREE(nameString);
- if (code != 0) {
- *minor = code;
- return GSS_S_FAILURE;
- }
+ if (code != 0) {
+ *minor = code;
+ return GSS_S_FAILURE;
}
assert(krbPrinc != NULL);
gssEapImportNameInternal(OM_uint32 *minor,
const gss_buffer_t nameBuffer,
gss_name_t *pName,
- unsigned int flags)
+ OM_uint32 flags)
{
OM_uint32 major, tmpMinor;
krb5_context krbContext;
gss_OID_desc mech;
/* TOK_ID || MECH_OID_LEN || MECH_OID */
- if (remain < 6)
+ if (remain < 6) {
+ *minor = GSSEAP_BAD_NAME_TOKEN;
return GSS_S_BAD_NAME;
+ }
if (flags & EXPORT_NAME_FLAG_COMPOSITE)
tokType = TOK_TYPE_EXPORT_NAME_COMPOSITE;
tokType = TOK_TYPE_EXPORT_NAME;
/* TOK_ID */
- if (load_uint16_be(p) != tokType)
+ if (load_uint16_be(p) != tokType) {
+ *minor = GSSEAP_WRONG_TOK_ID;
return GSS_S_BAD_NAME;
+ }
UPDATE_REMAIN(2);
/* MECH_OID_LEN */
len = load_uint16_be(p);
- if (len < 2)
+ if (len < 2) {
+ *minor = GSSEAP_BAD_NAME_TOKEN;
return GSS_S_BAD_NAME;
+ }
UPDATE_REMAIN(2);
/* MECH_OID */
- if (p[0] != 0x06)
+ if (p[0] != 0x06) {
+ *minor = GSSEAP_BAD_NAME_TOKEN;
return GSS_S_BAD_NAME;
+ }
mech.length = p[1];
mech.elements = &p[2];
gssEapExportNameInternal(OM_uint32 *minor,
const gss_name_t name,
gss_buffer_t exportedName,
- unsigned int flags)
+ OM_uint32 flags)
{
OM_uint32 major = GSS_S_FAILURE, tmpMinor;
gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
*/
#ifdef HAVE_HEIMDAL_VERSION
if (KRB_PRINC_REALM(name->krbPrincipal) == NULL ||
- KRB_PRINC_REALM(name->krBPrincipal)[0] == '\0')
+ KRB_PRINC_REALM(name->krbPrincipal)[0] == '\0')
#else
if (KRB_PRINC_REALM(name->krbPrincipal)->length == 0)
#endif
krb5_free_unparsed_name(krbContext, krbName);
- if (KRB_PRINC_TYPE(name->krbPrincipal) == KRB5_NT_WELLKNOWN &&
- krb5_principal_compare(krbContext,
- name->krbPrincipal, krbAnonymousPrincipal())) {
+ if (output_name_buffer->length == 0) {
name_type = GSS_C_NT_ANONYMOUS;
+ } else if (name->flags & NAME_FLAG_NAI) {
+ name_type = GSS_C_NT_USER_NAME;
} else {
name_type = GSS_EAP_NT_EAP_NAME;
}
return GSS_S_COMPLETE;
}
+
+OM_uint32
+gssEapCompareName(OM_uint32 *minor,
+ gss_name_t name1,
+ gss_name_t name2,
+ int *name_equal)
+{
+ krb5_context krbContext;
+
+ *minor = 0;
+
+ if (name1 == GSS_C_NO_NAME && name2 == GSS_C_NO_NAME) {
+ *name_equal = 1;
+ } else if (name1 != GSS_C_NO_NAME && name2 != GSS_C_NO_NAME) {
+ GSSEAP_KRB_INIT(&krbContext);
+
+ /* krbPrincipal is immutable, so lock not required */
+ *name_equal = krb5_principal_compare(krbContext,
+ name1->krbPrincipal,
+ name2->krbPrincipal);
+ }
+
+ return GSS_S_COMPLETE;
+}
projects / mech_eap.orig / blobdiff