/*
- * 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_KRB_INIT(&krbContext);
krb5_free_principal(krbContext, name->krbPrincipal);
+ gssEapReleaseOid(&tmpMinor, &name->mechanismUsed);
gssEapReleaseAttrContext(&tmpMinor, name);
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 GSSEAP_UNUSED,
+ 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)
remain = nameBuffer->length;
if (flags & EXPORT_NAME_FLAG_OID) {
- if (remain < 6 + GSS_EAP_MECHANISM->length + 4)
+ gss_OID_desc mech;
+
+ /* TOK_ID || MECH_OID_LEN || MECH_OID */
+ if (remain < 6)
return GSS_S_BAD_NAME;
if (flags & EXPORT_NAME_FLAG_COMPOSITE)
/* MECH_OID_LEN */
len = load_uint16_be(p);
- if (len != 2 + GSS_EAP_MECHANISM->length)
+ if (len < 2)
return GSS_S_BAD_NAME;
UPDATE_REMAIN(2);
/* MECH_OID */
if (p[0] != 0x06)
return GSS_S_BAD_NAME;
- if (p[1] != GSS_EAP_MECHANISM->length)
- return GSS_S_BAD_MECH;
- if (memcmp(&p[2], GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
- return GSS_S_BAD_MECH;
- UPDATE_REMAIN(2 + GSS_EAP_MECHANISM->length);
+
+ mech.length = p[1];
+ mech.elements = &p[2];
+
+ CHECK_REMAIN(mech.length);
+
+ if (!gssEapIsMechanismOid(&mech)) {
+ major = GSS_S_BAD_NAME;
+ *minor = GSSEAP_WRONG_MECH;
+ goto cleanup;
+ }
+
+ if (oidEqual(&mech, GSS_EAP_MECHANISM)) {
+ name->mechanismUsed = GSS_C_NO_OID;
+ } else if (!gssEapInternalizeOid(&mech, &name->mechanismUsed)) {
+ major = duplicateOid(minor, &mech, &name->mechanismUsed);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+
+ UPDATE_REMAIN(2 + mech.length);
}
/* NAME_LEN */
+ CHECK_REMAIN(4);
len = load_uint32_be(p);
UPDATE_REMAIN(4);
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))
gssEapImportName(OM_uint32 *minor,
const gss_buffer_t nameBuffer,
gss_OID nameType,
- gss_name_t *name)
+ gss_OID mechType,
+ gss_name_t *pName)
{
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;
+ OM_uint32 major = GSS_S_BAD_NAMETYPE;
+ OM_uint32 tmpMinor;
+ gss_name_t name = GSS_C_NO_NAME;
if (nameType == GSS_C_NO_OID)
nameType = nameTypes[0].oid;
for (i = 0; i < sizeof(nameTypes) / sizeof(nameTypes[0]); i++) {
- if (oidEqual(nameTypes[i].oid, nameType))
- return nameTypes[i].import(minor, nameBuffer, name);
+ if (oidEqual(nameTypes[i].oid, nameType)) {
+ major = nameTypes[i].import(minor, nameBuffer, &name);
+ break;
+ }
+ }
+
+ if (major == GSS_S_COMPLETE &&
+ mechType != GSS_C_NO_OID) {
+ assert(gssEapIsConcreteMechanismOid(mechType));
+ assert(name->mechanismUsed == GSS_C_NO_OID);
+
+ if (!gssEapInternalizeOid(mechType, &name->mechanismUsed)) {
+ major = duplicateOid(minor, mechType, &name->mechanismUsed);
+ }
}
- return GSS_S_BAD_NAMETYPE;
+ if (GSS_ERROR(major))
+ gssEapReleaseName(&tmpMinor, &name);
+ else
+ *pName = name;
+
+ return major;
}
OM_uint32
size_t krbNameLen, exportedNameLen;
unsigned char *p;
gss_buffer_desc attrs = GSS_C_EMPTY_BUFFER;
+ gss_OID mech;
exportedName->length = 0;
exportedName->value = NULL;
+ if (name->mechanismUsed != GSS_C_NO_OID)
+ mech = name->mechanismUsed;
+ else
+ mech = GSS_EAP_MECHANISM;
+
GSSEAP_KRB_INIT(&krbContext);
*minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
exportedNameLen = 0;
if (flags & EXPORT_NAME_FLAG_OID) {
- exportedNameLen += 6 + GSS_EAP_MECHANISM->length;
+ exportedNameLen += 6 + mech->length;
}
exportedNameLen += 4 + krbNameLen;
if (flags & EXPORT_NAME_FLAG_COMPOSITE) {
major = gssEapExportAttrContext(minor, name, &attrs);
if (GSS_ERROR(major))
goto cleanup;
- exportedNameLen += 4 + attrs.length;
+ exportedNameLen += attrs.length;
}
exportedName->value = GSSEAP_MALLOC(exportedNameLen);
: TOK_TYPE_EXPORT_NAME,
p);
p += 2;
- store_uint16_be(GSS_EAP_MECHANISM->length + 2, p);
+ store_uint16_be(mech->length + 2, p);
p += 2;
/* MECH_OID */
*p++ = 0x06;
- *p++ = GSS_EAP_MECHANISM->length & 0xff;
- memcpy(p, GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length);
- p += GSS_EAP_MECHANISM->length;
+ *p++ = mech->length & 0xff;
+ memcpy(p, mech->elements, mech->length);
+ p += mech->length;
}
/* NAME_LEN */
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:
gss_release_buffer(&tmpMinor, &attrs);
return major;
}
+ if (input_name->mechanismUsed == GSS_C_NO_OID) {
+ name->mechanismUsed = GSS_C_NO_OID;
+ } else if (gssEapIsConcreteMechanismOid(input_name->mechanismUsed)) {
+ if (!gssEapInternalizeOid(input_name->mechanismUsed,
+ &name->mechanismUsed)) {
+ major = duplicateOid(minor, input_name->mechanismUsed,
+ &name->mechanismUsed);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+ } else {
+ major = GSS_S_BAD_MECH;
+ *minor = GSSEAP_WRONG_MECH;
+ goto cleanup;
+ }
+
+ 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;
}
projects / mech_eap.orig / blobdiff