/*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* or implied warranty.
*/
+/*
+ * Name utility routines.
+ */
+
#include "gssapiP_eap.h"
static gss_OID_desc 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;
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 = GSSEAP_WRONG_SIZE; \
major = GSS_S_BAD_NAME; \
+ *minor = GSSEAP_TOK_TRUNC; \
goto cleanup; \
} \
} while (0)
}
major = GSS_S_COMPLETE;
+ *minor = 0;
cleanup:
if (GSS_ERROR(major))
{ 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 },
assert(p == (unsigned char *)exportedName->value + exportedNameLen);
- *minor = 0;
major = GSS_S_COMPLETE;
+ *minor = 0;
cleanup:
gss_release_buffer(&tmpMinor, &attrs);
return major;
}
+ name->flags = input_name->flags;
+
*minor = krb5_copy_principal(krbContext, input_name->krbPrincipal,
&name->krbPrincipal);
if (*minor != 0) {
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;
}