X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=init_sec_context.c;h=f1f260a18213cdee7a3961ff82ad6ebbb8983857;hb=31355119edb3a282ab302c05e33e23430af67603;hp=119eb4f30b6a261a9be770d4335637d39ed5b747;hpb=d4fe7ce93304facaf069792c347b01b25ab765ae;p=mech_eap.orig diff --git a/init_sec_context.c b/init_sec_context.c index 119eb4f..f1f260a 100644 --- a/init_sec_context.c +++ b/init_sec_context.c @@ -183,11 +183,12 @@ static struct eapol_callbacks gssEapPolicyCallbacks = { peerNotifyPending, }; +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; @@ -196,8 +197,8 @@ peerConfigInit(OM_uint32 *minor, GSSEAP_KRB_INIT(&krbContext); - if (loadConfig) { - } + eapPeerConfig->fragment_size = 1024; + wpa_debug_level = 0; code = krb5_unparse_name(krbContext, cred->name->krbPrincipal, &identity); if (code != 0) { @@ -228,29 +229,42 @@ peerConfigFree(OM_uint32 *minor, } static OM_uint32 -peerDeriveKey(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 @@ -260,10 +274,100 @@ peerDeriveKey(OM_uint32 *minor, ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG); } + 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 +initBegin(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) +{ + OM_uint32 major; + + if (cred != GSS_C_NO_CREDENTIAL && cred->expiryTime) + ctx->expiryTime = cred->expiryTime; + else if (timeReq == 0 || timeReq == GSS_C_INDEFINITE) + ctx->expiryTime = 0; + else + ctx->expiryTime = time(NULL) + timeReq; + + if (cred != GSS_C_NO_CREDENTIAL) { + 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; + + 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) +{ + OM_uint32 major; + int initialContextToken; + + initialContextToken = (inputToken->length == 0); + if (!initialContextToken) + return GSS_S_DEFECTIVE_TOKEN; + + major = initBegin(minor, cred, ctx, target, mech, + reqFlags, timeReq, chanBindings, + inputToken, outputToken); + if (GSS_ERROR(major)) + return major; + + 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, @@ -275,89 +379,82 @@ eapGssSmInitAuthenticate(OM_uint32 *minor, gss_buffer_t inputToken, gss_buffer_t outputToken) { - OM_uint32 major, tmpMinor; - time_t now; - int initialContextToken = 0, code; + OM_uint32 major; + 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) { - ctx->flags |= CTX_FLAG_EAP_PORT_ENABLED; + if (ctx->initiatorCtx.eap == NULL) { + struct eap_config eapConfig; + + memset(&eapConfig, 0, sizeof(eapConfig)); ctx->initiatorCtx.eap = eap_peer_sm_init(ctx, &gssEapPolicyCallbacks, ctx, - &ctx->initiatorCtx.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)) - goto cleanup; - - major = gss_duplicate_name(minor, target, &ctx->acceptorName); - if (GSS_ERROR(major)) + &eapConfig); + if (ctx->initiatorCtx.eap == NULL) { + major = GSS_S_FAILURE; 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; + + 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); - code = eap_peer_sm_step(ctx->initiatorCtx.eap); + major = GSS_S_CONTINUE_NEEDED; + code = eap_peer_sm_step(ctx->initiatorCtx.eap); if (ctx->flags & CTX_FLAG_EAP_RESP) { - struct wpabuf *resp; - gss_buffer_desc buf; - ctx->flags &= ~(CTX_FLAG_EAP_RESP); resp = eap_get_eapRespData(ctx->initiatorCtx.eap); - - if (resp != NULL) { - buf.length = wpabuf_len(resp); - buf.value = (void *)wpabuf_head(resp); - - major = duplicateBuffer(minor, &buf, outputToken); - if (GSS_ERROR(major)) - goto cleanup; - - major = GSS_S_CONTINUE_NEEDED; - } - } - - if (ctx->flags & CTX_FLAG_EAP_SUCCESS) { - major = peerDeriveKey(minor, ctx); + } else if (ctx->flags & CTX_FLAG_EAP_SUCCESS) { + major = initReady(minor, ctx); if (GSS_ERROR(major)) goto cleanup; ctx->flags &= ~(CTX_FLAG_EAP_SUCCESS); - ctx->state = EAP_STATE_ESTABLISHED; - major = GSS_S_COMPLETE; - } else if ((ctx->flags & CTX_FLAG_EAP_FAIL) || code == 0) { - major = GSS_S_FAILURE; + major = GSS_S_CONTINUE_NEEDED; + ctx->state = EAP_STATE_EXTENSIONS_REQ; + } 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 respBuf; + + assert(major == GSS_S_CONTINUE_NEEDED); + + respBuf.length = wpabuf_len(resp); + respBuf.value = (void *)wpabuf_head(resp); + + tmpMajor = duplicateBuffer(&tmpMinor, &respBuf, outputToken); + if (GSS_ERROR(tmpMajor)) { + major = tmpMajor; + *minor = tmpMinor; + } + } + wpabuf_set(&ctx->initiatorCtx.reqData, NULL, 0); peerConfigFree(&tmpMinor, ctx); @@ -365,48 +462,79 @@ 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) +initGssChannelBindings(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_channel_bindings_t chanBindings, + gss_buffer_t outputToken) { - GSSEAP_NOT_IMPLEMENTED; + OM_uint32 major; + gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER; + + + if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) + buffer = chanBindings->application_data; + + major = gssEapWrap(minor, ctx, TRUE, GSS_C_QOP_DEFAULT, + &buffer, NULL, outputToken); + if (GSS_ERROR(major)) + return major; + + return GSS_S_CONTINUE_NEEDED; } 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) +eapGssSmInitExtensionsReq(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; + OM_uint32 major, tmpMinor; + gss_buffer_desc cbToken = GSS_C_EMPTY_BUFFER; + + major = initGssChannelBindings(minor, ctx, chanBindings, &cbToken); + if (GSS_ERROR(major)) + return major; + + ctx->state = EAP_STATE_EXTENSIONS_RESP; + + major = duplicateBuffer(minor, &cbToken, outputToken); + if (GSS_ERROR(major)) { + gss_release_buffer(&tmpMinor, &cbToken); + return major; + } + + gss_release_buffer(&tmpMinor, &cbToken); + + return GSS_S_CONTINUE_NEEDED; } static OM_uint32 -eapGssSmInitGssChannelBindings(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) +eapGssSmInitExtensionsResp(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; + OM_uint32 major; + + major = gssEapStoreReauthCreds(minor, ctx, cred, inputToken); + if (GSS_ERROR(major)) + return major; + + ctx->state = EAP_STATE_ESTABLISHED; + + return GSS_S_COMPLETE; } static OM_uint32 @@ -426,7 +554,80 @@ eapGssSmInitEstablished(OM_uint32 *minor, return GSS_S_BAD_STATUS; } -static struct eap_gss_initiator_sm { +static int +canReauthP(gss_cred_id_t cred) +{ + return (cred != GSS_C_NO_CREDENTIAL && + cred->krbCred != GSS_C_NO_CREDENTIAL && + cred->expiryTime > time(NULL)); +} + +static OM_uint32 +eapGssSmInitGssReauth(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) +{ + OM_uint32 major, tmpMinor; + gss_name_t mechTarget = GSS_C_NO_NAME; + gss_OID actualMech = GSS_C_NO_OID; + OM_uint32 gssFlags, timeRec; + + assert(cred != GSS_C_NO_CREDENTIAL); + + ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS; + + if (inputToken->length == 0) { + major = initBegin(minor, cred, ctx, target, mech, + reqFlags, timeReq, chanBindings, + inputToken, outputToken); + if (GSS_ERROR(major)) + goto cleanup; + } + + major = gssEapMechToGlueName(minor, target, &mechTarget); + if (GSS_ERROR(major)) + goto cleanup; + + major = gssInitSecContext(minor, + cred->krbCred, + &ctx->kerberosCtx, + mechTarget, + (gss_OID)gss_mech_krb5, + reqFlags | GSS_C_DCE_STYLE, + timeReq, + chanBindings, + inputToken, + &actualMech, + outputToken, + &gssFlags, + &timeRec); + if (GSS_ERROR(major)) + goto cleanup; + + ctx->gssFlags = gssFlags; + + if (major == GSS_S_COMPLETE) { + major = gssEapReauthComplete(minor, ctx, cred, actualMech, timeRec); + if (GSS_ERROR(major)) + goto cleanup; + + ctx->state = EAP_STATE_ESTABLISHED; + } + +cleanup: + gssReleaseName(&tmpMinor, &mechTarget); + + return major; +} + +static struct gss_eap_initiator_sm { enum gss_eap_token_type inputTokenType; enum gss_eap_token_type outputTokenType; OM_uint32 (*processToken)(OM_uint32 *, @@ -440,11 +641,12 @@ static struct eap_gss_initiator_sm { gss_buffer_t, gss_buffer_t); } eapGssInitiatorSm[] = { - { 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_NONE, eapGssSmInitEstablished }, + { TOK_TYPE_NONE, TOK_TYPE_EAP_RESP, eapGssSmInitIdentity }, + { TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitAuthenticate }, + { TOK_TYPE_NONE, TOK_TYPE_EXT_REQ, eapGssSmInitExtensionsReq }, + { TOK_TYPE_EXT_RESP,TOK_TYPE_NONE, eapGssSmInitExtensionsResp }, + { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmInitEstablished }, + { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmInitGssReauth }, }; OM_uint32 @@ -462,16 +664,16 @@ gss_init_sec_context(OM_uint32 *minor, OM_uint32 *ret_flags, OM_uint32 *time_rec) { - OM_uint32 major, tmpMinor; + 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; + enum gss_eap_token_type tokType; *minor = 0; - innerOutputToken.length = 0; - innerOutputToken.value = NULL; - output_token->length = 0; output_token->value = NULL; @@ -490,6 +692,9 @@ gss_init_sec_context(OM_uint32 *minor, ctx->flags |= CTX_FLAG_INITIATOR; + if (canReauthP(cred)) + ctx->state = EAP_STATE_KRB_REAUTH_GSS; + *context_handle = ctx; } @@ -499,9 +704,14 @@ gss_init_sec_context(OM_uint32 *minor, if (input_token != GSS_C_NO_BUFFER) { major = gssEapVerifyToken(minor, ctx, input_token, - sm->inputTokenType, &innerInputToken); + &tokType, &innerInputToken); if (GSS_ERROR(major)) goto cleanup; + + if (tokType != sm->inputTokenType) { + major = GSS_S_DEFECTIVE_TOKEN; + goto cleanup; + } } else { innerInputToken.length = 0; innerInputToken.value = NULL; @@ -512,6 +722,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, @@ -524,22 +736,25 @@ 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) { - major = gssEapMakeToken(minor, ctx, &innerOutputToken, - sm->outputTokenType, output_token); - if (GSS_ERROR(major)) + if (innerOutputToken.value != NULL) { + tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, + sm->outputTokenType, output_token); + if (GSS_ERROR(tmpMajor)) { + major = tmpMajor; + *minor = tmpMinor; goto cleanup; + } } 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);