#include "gssapiP_eap.h"
-static const gss_OID_desc gssEapNtPrincipalName = {
+static gss_OID_desc gssEapNtPrincipalName = {
/* 1.3.6.1.4.1.5322.21.2.1 */
- 12, "\x06\x0A\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
+ 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01"
};
-const gss_OID_desc *const GSS_EAP_NT_PRINCIPAL_NAME =
- &gssEapNtPrincipalName;
+gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName;
OM_uint32
gssEapAllocName(OM_uint32 *minor, gss_name_t *pName)
OM_uint32 tmpMinor;
gss_name_t name;
- assert(*pName == GSS_C_NO_NAME);
+ *pName = GSS_C_NO_NAME;
name = (gss_name_t)GSSEAP_CALLOC(1, sizeof(*name));
if (name == NULL) {
GSSEAP_KRB_INIT(&krbContext);
krb5_free_principal(krbContext, name->krbPrincipal);
- radiusFreeAVPs(&tmpMinor, name->avps);
- samlFreeAssertion(&tmpMinor, name->assertion);
+ gssEapReleaseAttrContext(&tmpMinor, name);
GSSEAP_MUTEX_DESTROY(&name->mutex);
GSSEAP_FREE(name);
name->krbPrincipal = *principal;
*principal = NULL;
+ if (name->krbPrincipal->length == 1) {
+ name->flags |= NAME_FLAG_NAI;
+ } else {
+ name->flags |= NAME_FLAG_SERVICE;
+ }
+
+ *pName = name;
*minor = 0;
+
return GSS_S_COMPLETE;
}
OM_uint32 major, tmpMinor;
krb5_context krbContext;
unsigned char *p;
- int composite = 0;
size_t len, remain;
gss_buffer_desc buf;
+ enum gss_eap_token_type tok_type;
+ gss_name_t name = GSS_C_NO_NAME;
GSSEAP_KRB_INIT(&krbContext);
if (remain < 6 + GSS_EAP_MECHANISM->length + 4)
return GSS_S_BAD_NAME;
- if (*p++ != 0x04)
- return GSS_S_BAD_NAME;
+#define UPDATE_REMAIN(n) do { \
+ p += (n); \
+ remain -= (n); \
+ } while (0)
- switch (*p++) {
- case 0x02:
- composite = 1;
- break;
- case 0x01:
- break;
- default:
+ /* TOK_ID */
+ tok_type = load_uint16_be(p);
+ if (tok_type != TOK_TYPE_EXPORT_NAME &&
+ tok_type != TOK_TYPE_EXPORT_NAME_COMPOSITE)
return GSS_S_BAD_NAME;
- break;
- }
- remain -= 2;
+ UPDATE_REMAIN(2);
+ /* MECH_OID_LEN */
len = load_uint16_be(p);
if (len != 2 + GSS_EAP_MECHANISM->length)
return GSS_S_BAD_NAME;
- p += 2;
- remain -= 2;
+ UPDATE_REMAIN(2);
- if (*p++ != 0x06)
+ /* MECH_OID */
+ if (p[0] != 0x06)
return GSS_S_BAD_NAME;
- if (*p++ != GSS_EAP_MECHANISM->length)
+ if (p[1] != GSS_EAP_MECHANISM->length)
return GSS_S_BAD_MECH;
- remain -= 2;
-
- if (memcmp(p, GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
+ if (memcmp(&p[2], GSS_EAP_MECHANISM->elements, GSS_EAP_MECHANISM->length))
return GSS_S_BAD_MECH;
- p += GSS_EAP_MECHANISM->length;
- remain -= GSS_EAP_MECHANISM->length;
+ UPDATE_REMAIN(2 + GSS_EAP_MECHANISM->length);
+ /* NAME_LEN */
len = load_uint32_be(p);
- p += 4;
-
- if (remain < len)
- return GSS_S_BAD_NAME;
-
+ UPDATE_REMAIN(4);
+
+#define CHECK_REMAIN(n) do { \
+ if (remain < (n)) { \
+ *minor = ERANGE; \
+ major = GSS_S_BAD_NAME; \
+ goto cleanup; \
+ } \
+ } while (0)
+
+ /* NAME */
+ CHECK_REMAIN(len);
buf.length = len;
buf.value = p;
+ UPDATE_REMAIN(len);
- p += len;
- remain -= len;
+ major = importUserName(minor, &buf, &name);
+ if (GSS_ERROR(major))
+ goto cleanup;
- if (composite == 0 && remain != 0)
- return GSS_S_BAD_NAME;
+ if (tok_type == TOK_TYPE_EXPORT_NAME_COMPOSITE) {
+ gss_buffer_desc buf;
- major = importUserName(minor, &buf, pName);
- if (GSS_ERROR(major))
- return major;
+ CHECK_REMAIN(4);
+ name->flags = load_uint32_be(p);
+ UPDATE_REMAIN(4);
- /* XXX TODO composite handling */
+ CHECK_REMAIN(4);
+ buf.length = load_uint32_be(p);
+ UPDATE_REMAIN(4);
- return GSS_S_COMPLETE;
+ CHECK_REMAIN(buf.length);
+ buf.value = p;
+ UPDATE_REMAIN(buf.length);
+
+ major = gssEapImportAttrContext(minor, &buf, name);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+
+ major = GSS_S_COMPLETE;
+
+cleanup:
+ if (GSS_ERROR(major))
+ gssEapReleaseName(&tmpMinor, &name);
+ else
+ *pName = name;
+
+ return major;
}
-OM_uint32 gssEapImportName(OM_uint32 *minor,
- const gss_buffer_t nameBuffer,
- gss_OID nameType,
- gss_name_t *name)
+OM_uint32
+gssEapImportName(OM_uint32 *minor,
+ const gss_buffer_t nameBuffer,
+ gss_OID nameType,
+ gss_name_t *name)
{
OM_uint32 major, tmpMinor;
return major;
}
-OM_uint32 gssEapExportName(OM_uint32 *minor,
- const gss_name_t name,
- gss_buffer_t exportedName,
- int composite)
+OM_uint32
+gssEapExportName(OM_uint32 *minor,
+ const gss_name_t name,
+ gss_buffer_t exportedName,
+ int composite)
{
- OM_uint32 major, tmpMinor;
+ OM_uint32 major = GSS_S_FAILURE, tmpMinor;
krb5_context krbContext;
char *krbName = NULL;
size_t krbNameLen;
unsigned char *p;
+ gss_buffer_desc attrs = GSS_C_EMPTY_BUFFER;
exportedName->length = 0;
exportedName->value = NULL;
GSSEAP_KRB_INIT(&krbContext);
-
- if (name == GSS_C_NO_NAME) {
- *minor = EINVAL;
- return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME;
- }
-
GSSEAP_MUTEX_LOCK(&name->mutex);
- /*
- * Don't export a composite name if we don't have any attributes.
- */
- if (composite &&
- (name->flags & (NAME_FLAG_SAML | NAME_FLAG_RADIUS)) == 0) {
- composite = 0;
- }
-
*minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
if (*minor != 0) {
major = GSS_S_FAILURE;
exportedName->length = 6 + GSS_EAP_MECHANISM->length + 4 + krbNameLen;
if (composite) {
- /* TODO: export SAML/AVP, this is pending specification */
- GSSEAP_NOT_IMPLEMENTED;
+ exportedName->length += 4;
+
+ major = gssEapExportAttrContext(minor, name, &attrs);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ exportedName->length += 4 + attrs.length;
}
exportedName->value = GSSEAP_MALLOC(exportedName->length);
if (exportedName->value == NULL) {
- *minor = ENOMEM;
major = GSS_S_FAILURE;
+ *minor = ENOMEM;
goto cleanup;
}
+ /* TOK | MECH_OID_LEN */
p = (unsigned char *)exportedName->value;
- *p++ = 0x04;
- if (composite) {
- *p++ = 0x02;
- } else {
- *p++ = 0x01;
- }
+ store_uint16_be(composite
+ ? TOK_TYPE_EXPORT_NAME_COMPOSITE
+ : TOK_TYPE_EXPORT_NAME,
+ p);
+ p += 2;
store_uint16_be(GSS_EAP_MECHANISM->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;
+ /* NAME_LEN */
store_uint32_be(krbNameLen, p);
p += 4;
+
+ /* NAME */
memcpy(p, krbName, krbNameLen);
p += krbNameLen;
+ if (composite) {
+ store_uint32_be(name->flags, p);
+ p += 4;
+
+ store_uint32_be(attrs.length, p);
+ memcpy(&p[4], attrs.value, attrs.length);
+ p += 4 + attrs.length;
+ }
+
*minor = 0;
major = GSS_S_COMPLETE;
cleanup:
GSSEAP_MUTEX_UNLOCK(&name->mutex);
+ gss_release_buffer(&tmpMinor, &attrs);
if (GSS_ERROR(major))
gss_release_buffer(&tmpMinor, exportedName);
krb5_free_unparsed_name(krbContext, krbName);
return major;
}
+
projects / mech_eap.orig / blobdiff