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"
};
gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName;
GSSEAP_KRB_INIT(&krbContext);
krb5_free_principal(krbContext, name->krbPrincipal);
- radiusFreeAVPs(&tmpMinor, name->avps);
- samlFreeAssertion(&tmpMinor, name->assertion);
+ samlReleaseAttrContext(&tmpMinor, name);
+ radiusReleaseAttrContext(&tmpMinor, name);
GSSEAP_MUTEX_DESTROY(&name->mutex);
GSSEAP_FREE(name);
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;
+#define UPDATE_REMAIN(n) do { \
+ p += (n); \
+ remain -= (n); \
+ } while (0)
+
/* 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;
- p += 2;
- 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);
/* 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, 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 += 2 + GSS_EAP_MECHANISM->length;
- remain -= 2 + GSS_EAP_MECHANISM->length;
+ UPDATE_REMAIN(2 + GSS_EAP_MECHANISM->length);
/* NAME_LEN */
len = load_uint32_be(p);
- p += 4;
+ UPDATE_REMAIN(4);
- if (remain < len)
- return GSS_S_BAD_NAME;
+#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 */
+ if (name->flags & NAME_FLAG_RADIUS_ATTRIBUTES) {
+ 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 = radiusImportAttrContext(minor, &buf, name);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ }
+
+ if (name->flags & NAME_FLAG_SAML_ATTRIBUTES) {
+ CHECK_REMAIN(4);
+ buf.length = load_uint32_be(p);
+ UPDATE_REMAIN(4);
+
+ CHECK_REMAIN(buf.length);
+ buf.value = p;
+ UPDATE_REMAIN(buf.length);
+
+ major = samlImportAttrContext(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 = GSS_S_FAILURE, tmpMinor;
krb5_context krbContext;
char *krbName = NULL;
size_t krbNameLen;
unsigned char *p;
+ gss_buffer_desc radius, saml;
+
+ radius.length = 0;
+ radius.value = NULL;
+
+ saml.length = 0;
+ saml.value = NULL;
exportedName->length = 0;
exportedName->value = NULL;
composite = 0;
*minor = krb5_unparse_name(krbContext, name->krbPrincipal, &krbName);
- if (*minor != 0)
+ if (*minor != 0) {
+ major = GSS_S_FAILURE;
goto cleanup;
+ }
krbNameLen = strlen(krbName);
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;
+
+ if (name->flags & NAME_FLAG_RADIUS_ATTRIBUTES) {
+ major = radiusExportAttrContext(minor, name, &radius);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ exportedName->length += 4 + radius.length;
+ }
+ if (name->flags & NAME_FLAG_SAML_ATTRIBUTES) {
+ major = samlExportAttrContext(minor, name, &saml);
+ if (GSS_ERROR(major))
+ goto cleanup;
+ exportedName->length += 4 + saml.length;
+ }
}
exportedName->value = GSSEAP_MALLOC(exportedName->length);
if (exportedName->value == NULL) {
+ major = GSS_S_FAILURE;
*minor = ENOMEM;
goto cleanup;
}
memcpy(p, krbName, krbNameLen);
p += krbNameLen;
+ if (composite) {
+ store_uint32_be(name->flags, p);
+ p += 4;
+
+ if (name->flags & NAME_FLAG_RADIUS_ATTRIBUTES) {
+ store_uint32_be(radius.length, p);
+ memcpy(&p[4], radius.value, radius.length);
+ p += 4 + radius.length;
+ }
+ if (name->flags & NAME_FLAG_SAML_ATTRIBUTES) {
+ store_uint32_be(saml.length, p);
+ memcpy(&p[4], saml.value, saml.length);
+ p += 4 + saml.length;
+ }
+ }
+
*minor = 0;
major = GSS_S_COMPLETE;
cleanup:
GSSEAP_MUTEX_UNLOCK(&name->mutex);
+ gss_release_buffer(&tmpMinor, &saml);
+ gss_release_buffer(&tmpMinor, &radius);
if (GSS_ERROR(major))
gss_release_buffer(&tmpMinor, exportedName);
krb5_free_unparsed_name(krbContext, krbName);
i < sizeof(attributePrefixes) / sizeof(attributePrefixes[0]);
i++)
{
- gss_buffer_t p = &attributePrefixes[i];
-
- if (p->length == prefix->length &&
- memcmp(p->value, prefix->value, prefix->length) == 0) {
+ if (bufferEqual(&attributePrefixes[i], prefix))
return i;
- }
}
return ATTR_TYPE_NONE;
projects / mech_eap.git / blobdiff