*/
#include "gssapiP_eap.h"
+#include "radius/radius.h"
+#include "util_radius.h"
+#include "utils/radius_utils.h"
static OM_uint32
policyVariableToFlag(enum eapol_bool_var variable)
if (ctx == GSS_C_NO_CONTEXT)
return FALSE;
- assert(CTX_IS_INITIATOR(ctx));
+ GSSEAP_ASSERT(CTX_IS_INITIATOR(ctx));
switch (variable) {
case EAPOL_idleWhile:
if (ctx == GSS_C_NO_CONTEXT)
return;
- assert(CTX_IS_INITIATOR(ctx));
+ GSSEAP_ASSERT(CTX_IS_INITIATOR(ctx));
switch (variable) {
case EAPOL_idleWhile:
extern int wpa_debug_level;
#endif
+/* */
+static u8 componentToAttrMap[] =
+{
+ 128, /* GSS-Acceptor-Service-Name */
+ 129, /* GSS-Acceptor-Host-Name */
+ 130 /* GSS-Acceptor-Service-specific */
+};
+#define CHBIND_REALM_FLAG (1 << sizeof(componentToAttrMap))
+
+static OM_uint32
+peerInitEapChannelBinding(OM_uint32 *minor, gss_ctx_id_t ctx)
+{
+ struct wpabuf *buf;
+ radius_vendor_attr vendor_attr;
+ int component, components = 0;
+ unsigned int requested = 0;
+ krb5_principal princ;
+ /* must have acceptor name, but already checked in
+ * eapGssSmInitAcceptorName(), so maybe redunadant
+ * to do so here as well? */
+ if (!ctx->acceptorName) {
+ *minor = GSSEAP_NO_ACCEPTOR_NAME;
+ return GSS_S_BAD_NAME;
+ }
+
+ princ = ctx->acceptorName->krbPrincipal;
+ if (KRB_PRINC_LENGTH(princ) > sizeof(componentToAttrMap)) {
+ *minor = GSSEAP_BAD_ACCEPTOR_NAME;
+ return GSS_S_BAD_NAME;
+ }
+
+ /* allocate a buffer to hold channel binding data to be used by libeap */
+ buf = wpabuf_alloc(256);
+ if (!buf) {
+ *minor = ENOMEM;
+ return GSS_S_FAILURE;
+ }
+
+ for (component=0; component < KRB_PRINC_LENGTH(princ); component++)
+ {
+ krb5_data* name_data = KRB_PRINC_COMPONENT(princ, component);
+ if (name_data->length > 0)
+ {
+ components++;
+ vendor_attr = radius_vendor_attr_start(buf, VENDORPEC_UKERNA);
+ vendor_attr = radius_vendor_attr_add_subtype(vendor_attr,
+ componentToAttrMap[component],
+ (unsigned char *) name_data->data,
+ name_data->length);
+ requested |= 1<<component;
+ vendor_attr = radius_vendor_attr_finish(vendor_attr);
+ }
+ }
+
+ if (KRB_PRINC_REALM(princ) && (KRB_PRINC_REALM(princ)->length > 0)) {
+ components++;
+ requested |= CHBIND_REALM_FLAG;
+ vendor_attr = radius_vendor_attr_start(buf, VENDORPEC_UKERNA);
+ vendor_attr = radius_vendor_attr_add_subtype(vendor_attr, 131,
+ (unsigned char *) KRB_PRINC_REALM(princ)->data,
+ KRB_PRINC_REALM(princ)->length);
+ vendor_attr = radius_vendor_attr_finish(vendor_attr);
+ }
+
+ if ((components==0) || (vendor_attr == VENDOR_ATTR_INVALID)) {
+ wpabuf_free(buf);
+ *minor = GSSEAP_BAD_ACCEPTOR_NAME;
+ return GSS_S_BAD_NAME;
+ }
+ /* @TODO: realloc buf to actual size? */
+ ctx->initiatorCtx.chbindData = buf;
+ ctx->initiatorCtx.chbindReqFlags = requested;
+ return GSS_S_COMPLETE;
+}
+
+static void
+peerProcessChbindResponse(void *context, int code, int nsid,
+ u8 *data, size_t len)
+{
+ radius_parser msg, vendor_specific;
+ gss_ctx_id_t ctx = (gss_ctx_id_t )context;
+ void *vsadata;
+ u8 type;
+ u32 vendor_id;
+ u32 accepted = 0;
+ size_t vsadata_len;
+ int i;
+
+ if (nsid != CHBIND_NSID_RADIUS)
+ return;
+ msg = radius_parser_start(data, len);
+ if (!msg)
+ return;
+ while (radius_parser_parse_tlv(msg, &type, &vendor_id, &vsadata,
+ &vsadata_len) == 0) {
+ void *unused_data;
+ size_t unused_len;
+ u8 vendor_type;
+
+ if ((type != RADIUS_ATTR_VENDOR_SPECIFIC) ||
+ (vendor_id != VENDORPEC_UKERNA))
+ continue;
+ vendor_specific = radius_parser_start(vsadata, vsadata_len);
+ if (!vendor_specific)
+ continue;
+ while (radius_parser_parse_vendor_specific(vendor_specific,
+ &vendor_type,
+ &unused_data,
+ &unused_len) == 0) {
+ if (vendor_type == 131) {
+ accepted |= CHBIND_REALM_FLAG;
+ } else {
+ for (i=0; i<sizeof(componentToAttrMap); i++) {
+ if (componentToAttrMap[i]==vendor_type) {
+ accepted |= 1<<i;
+ break;
+ }
+ }
+ }
+ }
+ radius_parser_finish(vendor_specific);
+ }
+ radius_parser_finish(msg);
+ if ((code == CHBIND_CODE_SUCCESS) &&
+ (accepted == ctx->initiatorCtx.chbindReqFlags)) {
+ ctx->flags |= CTX_FLAG_EAP_CHBIND_ACCEPT;
+ /* Accepted! */
+ } else {
+ /* log failures? */
+ }
+}
+
static OM_uint32
peerConfigInit(OM_uint32 *minor, gss_ctx_id_t ctx)
{
eapPeerConfig->password = NULL;
eapPeerConfig->password_len = 0;
- assert(cred != GSS_C_NO_CREDENTIAL);
+ GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
GSSEAP_KRB_INIT(&krbContext);
wpa_debug_level = 0;
#endif
- assert(cred->name != GSS_C_NO_NAME);
+ GSSEAP_ASSERT(cred->name != GSS_C_NO_NAME);
if ((cred->name->flags & (NAME_FLAG_NAI | NAME_FLAG_SERVICE)) == 0) {
*minor = GSSEAP_BAD_INITIATOR_NAME;
eapPeerConfig->subject_match = (unsigned char *)cred->subjectNameConstraint.value;
eapPeerConfig->altsubject_match = (unsigned char *)cred->subjectAltNameConstraint.value;
+ /* eap channel binding */
+ if (ctx->initiatorCtx.chbindData)
+ {
+ struct eap_peer_chbind_config *chbind_config =
+ (struct eap_peer_chbind_config *)
+ GSSEAP_MALLOC(sizeof(struct eap_peer_chbind_config));
+ if (chbind_config == NULL) {
+ *minor = ENOMEM;
+ return GSS_S_FAILURE;
+ }
+
+ chbind_config->req_data = wpabuf_mhead_u8(ctx->initiatorCtx.chbindData);
+ chbind_config->req_data_len = wpabuf_len(ctx->initiatorCtx.chbindData);
+ chbind_config->nsid = CHBIND_NSID_RADIUS;
+ chbind_config->response_cb = &peerProcessChbindResponse;
+ chbind_config->ctx = ctx;
+ eapPeerConfig->chbind_config = chbind_config;
+ eapPeerConfig->chbind_config_len = 1;
+ } else {
+ eapPeerConfig->chbind_config = NULL;
+ eapPeerConfig->chbind_config_len = 0;
+ }
*minor = 0;
return GSS_S_COMPLETE;
}
OM_uint32 major;
gss_cred_id_t cred = ctx->cred;
- assert(cred != GSS_C_NO_CREDENTIAL);
+ GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
if (cred->expiryTime)
ctx->expiryTime = cred->expiryTime;
*minor = GSSEAP_BAD_ERROR_TOKEN;
}
- assert(GSS_ERROR(major));
+ GSSEAP_ASSERT(GSS_ERROR(major));
return major;
}
gss_OID actualMech = GSS_C_NO_OID;
OM_uint32 gssFlags, timeRec;
- assert(cred != GSS_C_NO_CREDENTIAL);
-
+ /*
+ * Here we use the passed in credential handle because the resolved
+ * context credential does not currently have the reauth creds.
+ */
if (GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_INITIAL) {
if (!gssEapCanReauthP(cred, target, timeReq))
return GSS_S_CONTINUE_NEEDED;
goto cleanup;
}
+ GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
+
major = gssEapMechToGlueName(minor, target, &mechTarget);
if (GSS_ERROR(major))
goto cleanup;
ctx->gssFlags = gssFlags;
if (major == GSS_S_COMPLETE) {
- assert(GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_REAUTHENTICATE);
+ GSSEAP_ASSERT(GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_REAUTHENTICATE);
major = gssEapReauthComplete(minor, ctx, cred, actualMech, timeRec);
if (GSS_ERROR(major))
return GSS_S_FAILURE;
}
+ /*
+ * Generate channel binding data
+ */
+ if (ctx->initiatorCtx.chbindData == NULL)
+ {
+ major = peerInitEapChannelBinding(minor, ctx);
+ if (GSS_ERROR(major))
+ return major;
+ }
+
return GSS_S_CONTINUE_NEEDED;
}
#endif
*smFlags |= SM_FLAG_FORCE_SEND_TOKEN;
- assert((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0);
- assert(inputToken == GSS_C_NO_BUFFER);
+ GSSEAP_ASSERT((ctx->flags & CTX_FLAG_KRB_REAUTH) == 0);
+ GSSEAP_ASSERT(inputToken == GSS_C_NO_BUFFER);
memset(&eapConfig, 0, sizeof(eapConfig));
*minor = 0;
- assert(inputToken != GSS_C_NO_BUFFER);
+ GSSEAP_ASSERT(inputToken != GSS_C_NO_BUFFER);
major = peerConfigInit(minor, ctx);
if (GSS_ERROR(major))
goto cleanup;
- assert(ctx->initiatorCtx.eap != NULL);
- assert(ctx->flags & CTX_FLAG_EAP_PORT_ENABLED);
+ GSSEAP_ASSERT(ctx->initiatorCtx.eap != NULL);
+ GSSEAP_ASSERT(ctx->flags & CTX_FLAG_EAP_PORT_ENABLED);
ctx->flags |= CTX_FLAG_EAP_REQ; /* we have a Request from the acceptor */
OM_uint32 tmpMajor;
gss_buffer_desc respBuf;
- assert(major == GSS_S_CONTINUE_NEEDED);
+ GSSEAP_ASSERT(major == GSS_S_CONTINUE_NEEDED);
respBuf.length = wpabuf_len(resp);
respBuf.value = (void *)wpabuf_head(resp);
if (GSS_ERROR(major))
return major;
- assert(outputToken->value != NULL);
+ GSSEAP_ASSERT(outputToken->value != NULL);
*minor = 0;
*smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL;
OM_uint32 major, tmpMinor;
int initialContextToken = (ctx->mechanismUsed == GSS_C_NO_OID);
+ /*
+ * XXX is acquiring the credential lock here necessary? The password is
+ * mutable but the contract could specify that this is not updated whilst
+ * a context is being initialized.
+ */
if (cred != GSS_C_NO_CREDENTIAL)
GSSEAP_MUTEX_LOCK(&cred->mutex);
if (GSS_ERROR(major))
goto cleanup;
- assert(ctx->cred != GSS_C_NO_CREDENTIAL);
+ GSSEAP_ASSERT(ctx->cred != GSS_C_NO_CREDENTIAL);
}
GSSEAP_MUTEX_LOCK(&ctx->cred->mutex);
- assert(ctx->cred->flags & CRED_FLAG_RESOLVED);
- assert(ctx->cred->flags & CRED_FLAG_INITIATE);
+ GSSEAP_ASSERT(ctx->cred->flags & CRED_FLAG_RESOLVED);
+ GSSEAP_ASSERT(ctx->cred->flags & CRED_FLAG_INITIATE);
if (initialContextToken) {
major = initBegin(minor, ctx, target_name, mech_type,
goto cleanup;
}
}
- if (ret_flags != NULL)
- *ret_flags = ctx->gssFlags;
+ if (ret_flags != NULL) {
+ if ((major == GSS_S_COMPLETE) &&
+ (ctx->flags & CTX_FLAG_EAP_CHBIND_ACCEPT))
+ *ret_flags = ctx->gssFlags | GSS_C_MUTUAL_FLAG;
+ else
+ *ret_flags = ctx->gssFlags & (~GSS_C_MUTUAL_FLAG);
+ }
+ if (major == GSS_S_COMPLETE)
+ major = major;
if (time_rec != NULL)
gssEapContextTime(&tmpMinor, ctx, time_rec);
- assert(CTX_IS_ESTABLISHED(ctx) || major == GSS_S_CONTINUE_NEEDED);
+ GSSEAP_ASSERT(CTX_IS_ESTABLISHED(ctx) || major == GSS_S_CONTINUE_NEEDED);
cleanup:
if (cred != GSS_C_NO_CREDENTIAL)
output_token->length = 0;
output_token->value = NULL;
- assert(ctx == GSS_C_NO_CONTEXT || ctx->mechanismUsed != GSS_C_NO_OID);
-
if (ctx == GSS_C_NO_CONTEXT) {
if (input_token != GSS_C_NO_BUFFER && input_token->length != 0) {
*minor = GSSEAP_WRONG_SIZE;
projects / mech_eap.git / blobdiff