X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=init_sec_context.c;h=173f234e0dc5dabc4e9580d9cb6d18a3ab6d62b1;hb=6fd9f5a521f9efa7cb9dd43f90ae8f33c83c66e1;hp=48784dd33dcf2d84aad20b376d10639a78d95ce7;hpb=8d5242de8807f650fd9634fad250bf3d0d8dbbb2;p=mech_eap.git diff --git a/init_sec_context.c b/init_sec_context.c index 48784dd..173f234 100644 --- a/init_sec_context.c +++ b/init_sec_context.c @@ -68,7 +68,6 @@ policyVariableToFlag(enum eapol_bool_var variable) } return flag; - } static struct eap_peer_config * @@ -189,8 +188,7 @@ extern int wpa_debug_level; static OM_uint32 peerConfigInit(OM_uint32 *minor, gss_cred_id_t cred, - gss_ctx_id_t ctx, - int loadConfig) + gss_ctx_id_t ctx) { krb5_context krbContext; struct eap_peer_config *eapPeerConfig = &ctx->initiatorCtx.eapPeerConfig; @@ -199,10 +197,8 @@ peerConfigInit(OM_uint32 *minor, GSSEAP_KRB_INIT(&krbContext); - if (loadConfig) { - eapPeerConfig->fragment_size = 1024; - wpa_debug_level = 0; - } + eapPeerConfig->fragment_size = 1024; + wpa_debug_level = 0; code = krb5_unparse_name(krbContext, cred->name->krbPrincipal, &identity); if (code != 0) { @@ -233,29 +229,42 @@ peerConfigFree(OM_uint32 *minor, } static OM_uint32 -completeInit(OM_uint32 *minor, - gss_ctx_id_t ctx) +initReady(OM_uint32 *minor, gss_ctx_id_t ctx) { OM_uint32 major; const unsigned char *key; size_t keyLength; - krb5_context krbContext; - - GSSEAP_KRB_INIT(&krbContext); + krb5_enctype encryptionType; + int gotKey = 0; /* Cache encryption type derived from selected mechanism OID */ - major = gssEapOidToEnctype(minor, ctx->mechanismUsed, &ctx->encryptionType); + major = gssEapOidToEnctype(minor, ctx->mechanismUsed, &encryptionType); if (GSS_ERROR(major)) return major; - if (ctx->encryptionType != ENCTYPE_NULL && + if (encryptionType != ENCTYPE_NULL && eap_key_available(ctx->initiatorCtx.eap)) { key = eap_get_eapKeyData(ctx->initiatorCtx.eap, &keyLength); - major = gssEapDeriveRFC3961Key(minor, key, keyLength, - ctx->encryptionType, &ctx->rfc3961Key); - if (GSS_ERROR(major)) - return major; + if (keyLength >= EAP_EMSK_LEN) { + major = gssEapDeriveRfc3961Key(minor, + &key[EAP_EMSK_LEN / 2], + EAP_EMSK_LEN / 2, + encryptionType, + &ctx->rfc3961Key); + if (GSS_ERROR(major)) + return major; + + major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key, + &ctx->checksumType); + if (GSS_ERROR(major)) + return major; + gotKey++; + } + } + + if (gotKey) { + ctx->encryptionType = encryptionType; } else { /* * draft-howlett-eap-gss says that integrity/confidentialty should @@ -265,15 +274,76 @@ completeInit(OM_uint32 *minor, ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG); } - sequenceInit(&ctx->seqState, ctx->recvSeq, - ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0), - ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0), - TRUE); + major = sequenceInit(minor, + &ctx->seqState, + ctx->recvSeq, + ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0), + ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0), + TRUE); + if (GSS_ERROR(major)) + return major; return GSS_S_COMPLETE; } static OM_uint32 +eapGssSmInitIdentity(OM_uint32 *minor, + gss_cred_id_t cred, + gss_ctx_id_t ctx, + gss_name_t target, + gss_OID mech, + OM_uint32 reqFlags, + OM_uint32 timeReq, + gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, + gss_buffer_t outputToken) +{ + time_t now; + OM_uint32 major; + int initialContextToken; + + initialContextToken = (inputToken == GSS_C_NO_BUFFER || + inputToken->length == 0); + if (!initialContextToken) + return GSS_S_DEFECTIVE_TOKEN; + + time(&now); + if (timeReq == 0 || timeReq == GSS_C_INDEFINITE) + ctx->expiryTime = 0; + else + ctx->expiryTime = now + timeReq; + + major = gssEapDuplicateName(minor, cred->name, &ctx->initiatorName); + if (GSS_ERROR(major)) + return major; + + major = gssEapDuplicateName(minor, target, &ctx->acceptorName); + if (GSS_ERROR(major)) + return major; + + if (mech == GSS_C_NULL_OID || oidEqual(mech, GSS_EAP_MECHANISM)) { + major = gssEapDefaultMech(minor, &ctx->mechanismUsed); + } else if (gssEapIsConcreteMechanismOid(mech)) { + if (!gssEapInternalizeOid(mech, &ctx->mechanismUsed)) + major = duplicateOid(minor, mech, &ctx->mechanismUsed); + } else { + major = GSS_S_BAD_MECH; + } + if (GSS_ERROR(major)) + return major; + + /* If credentials were provided, check they're usable with this mech */ + if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) + return GSS_S_BAD_MECH; + + ctx->state = EAP_STATE_AUTHENTICATE; + + return GSS_S_CONTINUE_NEEDED; +} + +static struct wpabuf emptyWpaBuffer; + +static OM_uint32 eapGssSmInitAuthenticate(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, @@ -286,61 +356,37 @@ eapGssSmInitAuthenticate(OM_uint32 *minor, gss_buffer_t outputToken) { OM_uint32 major; - OM_uint32 tmpMajor, tmpMinor; - time_t now; - int initialContextToken = 0, code; + OM_uint32 tmpMinor; + int code; struct wpabuf *resp = NULL; + int initialContextToken; initialContextToken = (inputToken == GSS_C_NO_BUFFER || inputToken->length == 0); - major = peerConfigInit(minor, cred, ctx, initialContextToken); + major = peerConfigInit(minor, cred, ctx); if (GSS_ERROR(major)) goto cleanup; - if (initialContextToken) { + if (ctx->initiatorCtx.eap == NULL) { struct eap_config eapConfig; memset(&eapConfig, 0, sizeof(eapConfig)); - ctx->flags |= CTX_FLAG_EAP_PORT_ENABLED; ctx->initiatorCtx.eap = eap_peer_sm_init(ctx, &gssEapPolicyCallbacks, ctx, &eapConfig); - - time(&now); - if (timeReq == 0 || timeReq == GSS_C_INDEFINITE) - ctx->expiryTime = 0; - else - ctx->expiryTime = now + timeReq; - - major = gss_duplicate_name(minor, cred->name, &ctx->initiatorName); - if (GSS_ERROR(major)) + if (ctx->initiatorCtx.eap == NULL) { + major = GSS_S_FAILURE; goto cleanup; - - major = gss_duplicate_name(minor, target, &ctx->acceptorName); - if (GSS_ERROR(major)) - goto cleanup; - - if (mech == GSS_C_NULL_OID || oidEqual(mech, GSS_EAP_MECHANISM)) { - major = gssEapDefaultMech(minor, &ctx->mechanismUsed); - } else if (gssEapIsConcreteMechanismOid(mech)) { - if (!gssEapInternalizeOid(mech, &ctx->mechanismUsed)) - major = duplicateOid(minor, mech, &ctx->mechanismUsed); - } else { - major = GSS_S_BAD_MECH; } - if (GSS_ERROR(major)) - goto cleanup; - resp = eap_sm_buildIdentity(ctx->initiatorCtx.eap, 0, 0); - major = GSS_S_CONTINUE_NEEDED; - goto cleanup; - } else { - ctx->flags |= CTX_FLAG_EAP_REQ; /* we have a Request from the acceptor */ + ctx->flags |= CTX_FLAG_EAP_RESTART | CTX_FLAG_EAP_PORT_ENABLED; } + ctx->flags |= CTX_FLAG_EAP_REQ; /* we have a Request from the acceptor */ + wpabuf_set(&ctx->initiatorCtx.reqData, inputToken->value, inputToken->length); @@ -352,24 +398,33 @@ eapGssSmInitAuthenticate(OM_uint32 *minor, resp = eap_get_eapRespData(ctx->initiatorCtx.eap); } else if (ctx->flags & CTX_FLAG_EAP_SUCCESS) { - major = completeInit(minor, ctx); + major = initReady(minor, ctx); + if (GSS_ERROR(major)) + goto cleanup; + ctx->flags &= ~(CTX_FLAG_EAP_SUCCESS); - ctx->state = EAP_STATE_ESTABLISHED; - } else if ((ctx->flags & CTX_FLAG_EAP_FAIL) || code == 0) { - major = GSS_S_FAILURE; + major = GSS_S_CONTINUE_NEEDED; + ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS; + } else if (ctx->flags & CTX_FLAG_EAP_FAIL) { + major = GSS_S_DEFECTIVE_CREDENTIAL; + } else if (code == 0 && initialContextToken) { + resp = &emptyWpaBuffer; + major = GSS_S_CONTINUE_NEEDED; + } else { + major = GSS_S_DEFECTIVE_TOKEN; } cleanup: if (resp != NULL) { OM_uint32 tmpMajor; - gss_buffer_desc buf; + gss_buffer_desc respBuf; assert(major == GSS_S_CONTINUE_NEEDED); - buf.length = wpabuf_len(resp); - buf.value = (void *)wpabuf_head(resp); + respBuf.length = wpabuf_len(resp); + respBuf.value = (void *)wpabuf_head(resp); - tmpMajor = duplicateBuffer(&tmpMinor, &buf, outputToken); + tmpMajor = duplicateBuffer(&tmpMinor, &respBuf, outputToken); if (GSS_ERROR(tmpMajor)) { major = tmpMajor; *minor = tmpMinor; @@ -383,36 +438,6 @@ cleanup: } static OM_uint32 -eapGssSmInitKeyTransport(OM_uint32 *minor, - gss_cred_id_t cred, - gss_ctx_id_t ctx, - gss_name_t target, - gss_OID mech, - OM_uint32 reqFlags, - OM_uint32 timeReq, - gss_channel_bindings_t chanBindings, - gss_buffer_t inputToken, - gss_buffer_t outputToken) -{ - GSSEAP_NOT_IMPLEMENTED; -} - -static OM_uint32 -eapGssSmInitSecureAssoc(OM_uint32 *minor, - gss_cred_id_t cred, - gss_ctx_id_t ctx, - gss_name_t target, - gss_OID mech, - OM_uint32 reqFlags, - OM_uint32 timeReq, - gss_channel_bindings_t chanBindings, - gss_buffer_t inputToken, - gss_buffer_t outputToken) -{ - GSSEAP_NOT_IMPLEMENTED; -} - -static OM_uint32 eapGssSmInitGssChannelBindings(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, @@ -424,7 +449,61 @@ eapGssSmInitGssChannelBindings(OM_uint32 *minor, gss_buffer_t inputToken, gss_buffer_t outputToken) { - GSSEAP_NOT_IMPLEMENTED; + OM_uint32 major; + gss_iov_buffer_desc iov[2]; + gss_buffer_desc buf; + + iov[0].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[1].buffer.length = 0; + iov[1].buffer.value = NULL; + + if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) + iov[0].buffer = chanBindings->application_data; + + major = gssEapWrapOrGetMIC(minor, ctx, FALSE, FALSE, iov, 2, + TOK_TYPE_GSS_CB); + if (GSS_ERROR(major)) + goto cleanup; + + /* Skip past token ID */ + assert(iov[1].buffer.length > 2); + assert(load_uint16_be(iov[1].buffer.value) == TOK_TYPE_GSS_CB); + + buf.length = iov[1].buffer.length - 2; + buf.value = (unsigned char *)iov[1].buffer.value + 2; + + major = duplicateBuffer(minor, &buf, outputToken); + if (GSS_ERROR(major)) + goto cleanup; + + major = GSS_S_COMPLETE; + ctx->state = EAP_STATE_ESTABLISHED; + +cleanup: + gssEapReleaseIov(iov, 2); + + return major; +} + +static OM_uint32 +eapGssSmInitKrbCred(OM_uint32 *minor, + gss_cred_id_t cred, + gss_ctx_id_t ctx, + gss_name_t target, + gss_OID mech, + OM_uint32 reqFlags, + OM_uint32 timeReq, + gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, + gss_buffer_t outputToken) +{ + /* Called with already established context */ + *minor = EINVAL; + return GSS_S_BAD_STATUS; } static OM_uint32 @@ -444,7 +523,7 @@ eapGssSmInitEstablished(OM_uint32 *minor, return GSS_S_BAD_STATUS; } -static struct eap_gss_initiator_sm { +static struct gss_eap_initiator_sm { enum gss_eap_token_type inputTokenType; enum gss_eap_token_type outputTokenType; OM_uint32 (*processToken)(OM_uint32 *, @@ -458,10 +537,10 @@ static struct eap_gss_initiator_sm { gss_buffer_t, gss_buffer_t); } eapGssInitiatorSm[] = { + { TOK_TYPE_NONE, TOK_TYPE_EAP_RESP, eapGssSmInitIdentity }, { TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitAuthenticate }, - { TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitKeyTransport }, - { TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitSecureAssoc }, - { TOK_TYPE_GSS_CB, TOK_TYPE_NONE, eapGssSmInitGssChannelBindings }, + { TOK_TYPE_NONE, TOK_TYPE_GSS_CB, eapGssSmInitGssChannelBindings }, + { TOK_TYPE_KRB_CRED,TOK_TYPE_NONE, eapGssSmInitKrbCred }, { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmInitEstablished }, }; @@ -483,14 +562,12 @@ gss_init_sec_context(OM_uint32 *minor, OM_uint32 major; OM_uint32 tmpMajor, tmpMinor; gss_ctx_id_t ctx = *context_handle; - struct eap_gss_initiator_sm *sm = NULL; - gss_buffer_desc innerInputToken, innerOutputToken; + struct gss_eap_initiator_sm *sm = NULL; + gss_buffer_desc innerInputToken; + gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER; *minor = 0; - innerOutputToken.length = 0; - innerOutputToken.value = NULL; - output_token->length = 0; output_token->value = NULL; @@ -531,6 +608,8 @@ gss_init_sec_context(OM_uint32 *minor, * the status is not GSS_S_COMPLETE or an error status. */ do { + sm = &eapGssInitiatorSm[ctx->state]; + major = (sm->processToken)(minor, cred, ctx, @@ -543,13 +622,13 @@ gss_init_sec_context(OM_uint32 *minor, &innerOutputToken); if (GSS_ERROR(major)) goto cleanup; - } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0); + } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.value == NULL); if (actual_mech_type != NULL) { if (!gssEapInternalizeOid(ctx->mechanismUsed, actual_mech_type)) duplicateOid(&tmpMinor, ctx->mechanismUsed, actual_mech_type); } - if (innerOutputToken.length != 0) { + if (innerOutputToken.value != NULL) { tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, sm->outputTokenType, output_token); if (GSS_ERROR(tmpMajor)) { @@ -561,7 +640,7 @@ gss_init_sec_context(OM_uint32 *minor, if (ret_flags != NULL) *ret_flags = ctx->gssFlags; if (time_rec != NULL) - gss_context_time(&tmpMinor, ctx, time_rec); + gssEapContextTime(&tmpMinor, ctx, time_rec); assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);