* or implied warranty.
*/
+/*
+ * Name utility routines.
+ */
+
#include "gssapiP_eap.h"
static gss_OID_desc gssEapNtPrincipalName = {
- /* 1.3.6.1.4.1.5322.21.2.1 */
- 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
+ /* 1.3.6.1.4.1.5322.22.2.1 */
+ 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x02\x01"
};
gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName;
krb5_context krbContext = NULL;
OM_uint32 tmpMinor;
+ *minor = 0;
+
if (pName == NULL) {
return GSS_S_COMPLETE;
}
GSSEAP_FREE(name);
*pName = NULL;
- *minor = 0;
return GSS_S_COMPLETE;
}
name->krbPrincipal = *principal;
*principal = NULL;
- if (name->krbPrincipal->length == 1) {
- name->flags |= NAME_FLAG_NAI;
- } else {
+ if (KRB_PRINC_LENGTH(name->krbPrincipal) > 1) {
name->flags |= NAME_FLAG_SERVICE;
+ } else {
+ name->flags |= NAME_FLAG_NAI;
}
*pName = name;
}
/* XXX this is probably NOT what we want to be doing */
- *minor = krb5_sname_to_principal(krbContext, host, service,
- KRB5_NT_SRV_HST, &krbPrinc);
- if (*minor != 0) {
+ if (krb5_sname_to_principal(krbContext, host, service,
+ KRB5_NT_SRV_HST, &krbPrinc) != 0) {
GSSEAP_FREE(service);
+ *minor = GSSEAP_BAD_SERVICE_NAME;
return GSS_S_FAILURE;
}
if (nameBuffer == GSS_C_NO_BUFFER) {
*minor = krb5_copy_principal(krbContext,
- krb5_anonymous_principal(), &krbPrinc);
+ krbAnonymousPrincipal(), &krbPrinc);
if (*minor != 0)
return GSS_S_FAILURE;
} else {
return major;
}
+static OM_uint32
+importAnonymousName(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ gss_name_t *pName)
+{
+ OM_uint32 major;
+ krb5_context krbContext;
+ krb5_principal krbPrinc;
+
+ GSSEAP_KRB_INIT(&krbContext);
+
+ *minor = krb5_copy_principal(krbContext, krbAnonymousPrincipal(),
+ &krbPrinc);
+ if (*minor != 0)
+ return GSS_S_FAILURE;
+
+ major = krbPrincipalToName(minor, &krbPrinc, pName);
+ if (GSS_ERROR(major)) {
+ krb5_free_principal(krbContext, krbPrinc);
+ }
+
+ return major;
+}
+
#define UPDATE_REMAIN(n) do { \
p += (n); \
remain -= (n); \
#define CHECK_REMAIN(n) do { \
if (remain < (n)) { \
- *minor = ERANGE; \
major = GSS_S_BAD_NAME; \
+ *minor = GSSEAP_TOK_TRUNC; \
goto cleanup; \
} \
} while (0)
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
gss_buffer_desc buf;
- CHECK_REMAIN(4);
- buf.length = load_uint32_be(p);
- UPDATE_REMAIN(4);
-
- CHECK_REMAIN(buf.length);
+ buf.length = remain;
buf.value = p;
- UPDATE_REMAIN(buf.length);
major = gssEapImportAttrContext(minor, &buf, name);
if (GSS_ERROR(major))
}
major = GSS_S_COMPLETE;
+ *minor = 0;
cleanup:
if (GSS_ERROR(major))
return major;
}
+static OM_uint32
+importExportName(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ gss_name_t *name)
+{
+ return gssEapImportNameInternal(minor, nameBuffer, name,
+ EXPORT_NAME_FLAG_OID);
+}
+
+#ifdef HAVE_GSS_C_NT_COMPOSITE_EXPORT
+static OM_uint32
+importCompositeExportName(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ gss_name_t *name)
+{
+ return gssEapImportNameInternal(minor, nameBuffer, name,
+ EXPORT_NAME_FLAG_OID |
+ EXPORT_NAME_FLAG_COMPOSITE);
+}
+#endif
+
+struct gss_eap_name_import_provider {
+ gss_OID oid;
+ OM_uint32 (*import)(OM_uint32 *, const gss_buffer_t, gss_name_t *);
+};
+
OM_uint32
gssEapImportName(OM_uint32 *minor,
const gss_buffer_t nameBuffer,
gss_OID nameType,
gss_name_t *name)
{
- OM_uint32 major, tmpMinor;
+ struct gss_eap_name_import_provider nameTypes[] = {
+ { GSS_C_NT_USER_NAME, importUserName },
+ { GSS_EAP_NT_PRINCIPAL_NAME, importUserName },
+ { GSS_C_NT_HOSTBASED_SERVICE, importServiceName },
+ { GSS_C_NT_HOSTBASED_SERVICE_X, importServiceName },
+ { GSS_C_NT_ANONYMOUS, importAnonymousName },
+ { GSS_C_NT_EXPORT_NAME, importExportName },
+#ifdef HAVE_GSS_C_NT_COMPOSITE_EXPORT
+ { GSS_C_NT_COMPOSITE_EXPORT, importCompositeExportName },
+#endif
+ };
+ size_t i;
*name = GSS_C_NO_NAME;
- if (nameType == GSS_C_NULL_OID ||
- oidEqual(nameType, GSS_C_NT_USER_NAME) ||
- oidEqual(nameType, GSS_EAP_NT_PRINCIPAL_NAME))
- major = importUserName(minor, nameBuffer, name);
- else if (oidEqual(nameType, GSS_C_NT_HOSTBASED_SERVICE) ||
- oidEqual(nameType, GSS_C_NT_HOSTBASED_SERVICE_X))
- major = importServiceName(minor, nameBuffer, name);
- else if (oidEqual(nameType, GSS_C_NT_EXPORT_NAME))
- major = gssEapImportNameInternal(minor, nameBuffer, name,
- EXPORT_NAME_FLAG_OID);
-#ifdef HAVE_GSS_C_NT_COMPOSITE_EXPORT
- else if (oidEqual(nameType, GSS_C_NT_COMPOSITE_EXPORT))
- major = gssEapImportNameInternal(minor, nameBuffer, name,
- EXPORT_NAME_FLAG_OID |
- EXPORT_NAME_FLAG_COMPOSITE);
-#endif
- else
- major = GSS_S_BAD_NAMETYPE;
+ if (nameType == GSS_C_NO_OID)
+ nameType = nameTypes[0].oid;
- if (GSS_ERROR(major))
- gssEapReleaseName(&tmpMinor, name);
+ for (i = 0; i < sizeof(nameTypes) / sizeof(nameTypes[0]); i++) {
+ if (oidEqual(nameTypes[i].oid, nameType))
+ return nameTypes[i].import(minor, nameBuffer, name);
+ }
- return major;
+ return GSS_S_BAD_NAMETYPE;
}
OM_uint32
exportedName->value = NULL;
GSSEAP_KRB_INIT(&krbContext);
- GSSEAP_MUTEX_LOCK(&name->mutex);
*minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
if (*minor != 0) {
major = gssEapExportAttrContext(minor, name, &attrs);
if (GSS_ERROR(major))
goto cleanup;
- exportedNameLen += 4 + attrs.length;
+ exportedNameLen += attrs.length;
}
exportedName->value = GSSEAP_MALLOC(exportedNameLen);
p += krbNameLen;
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
- store_uint32_be(attrs.length, p);
- memcpy(&p[4], attrs.value, attrs.length);
- p += 4 + attrs.length;
+ memcpy(p, attrs.value, attrs.length);
+ p += attrs.length;
}
- *minor = 0;
+ assert(p == (unsigned char *)exportedName->value + exportedNameLen);
+
major = GSS_S_COMPLETE;
+ *minor = 0;
cleanup:
- GSSEAP_MUTEX_UNLOCK(&name->mutex);
gss_release_buffer(&tmpMinor, &attrs);
if (GSS_ERROR(major))
gss_release_buffer(&tmpMinor, exportedName);
return major;
}
- /* Lock mutex for copying mutable attributes */
- GSSEAP_MUTEX_LOCK(&input_name->mutex);
+ name->flags = input_name->flags;
*minor = krb5_copy_principal(krbContext, input_name->krbPrincipal,
&name->krbPrincipal);
*dest_name = name;
cleanup:
- GSSEAP_MUTEX_UNLOCK(&input_name->mutex);
-
if (GSS_ERROR(major)) {
gssEapReleaseName(&tmpMinor, &name);
}
OM_uint32 major;
krb5_context krbContext;
char *krbName;
+ gss_OID name_type;
GSSEAP_KRB_INIT(&krbContext);
krb5_free_unparsed_name(krbContext, krbName);
+ if (KRB_PRINC_TYPE(name->krbPrincipal) == KRB5_NT_WELLKNOWN &&
+ krb5_principal_compare(krbContext,
+ name->krbPrincipal, krbAnonymousPrincipal())) {
+ name_type = GSS_C_NT_ANONYMOUS;
+ } else {
+ name_type = GSS_EAP_NT_PRINCIPAL_NAME;
+ }
+
if (output_name_type != NULL)
- *output_name_type = GSS_EAP_NT_PRINCIPAL_NAME;
+ *output_name_type = name_type;
return GSS_S_COMPLETE;
}
projects / mech_eap.orig / blobdiff