X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=accept_sec_context.c;h=5829ed9bda5f3f9653998e2b2a4526fac23ae539;hp=dd8ec4e4b5840153bcf76a5e713f0db4df2c46ee;hb=ae79fdae047f980d01b2b4e84ccea52e24d8c7a0;hpb=64954de1bfa1fb41180dd440ef0b8ed373e9d32e diff --git a/accept_sec_context.c b/accept_sec_context.c index dd8ec4e..5829ed9 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -40,11 +40,16 @@ #ifdef GSSEAP_ENABLE_REAUTH static OM_uint32 eapGssSmAcceptGssReauth(OM_uint32 *minor, - gss_ctx_id_t ctx, gss_cred_id_t cred, - gss_buffer_t inputToken, + 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 outputToken); + gss_buffer_t inputToken, + gss_buffer_t outputToken, + OM_uint32 *smFlags); #endif /* @@ -74,7 +79,9 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) ctx->gssFlags |= GSS_C_ANON_FLAG; } - major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME, + major = gssEapImportName(minor, &nameBuf, + (ctx->gssFlags & GSS_C_ANON_FLAG) ? + GSS_C_NT_ANONYMOUS : GSS_C_NT_USER_NAME, &ctx->initiatorName); if (GSS_ERROR(major)) return major; @@ -117,57 +124,191 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) return GSS_S_COMPLETE; } +static OM_uint32 +eapGssSmAcceptAcceptorName(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken, + OM_uint32 *smFlags GSSEAP_UNUSED) +{ + OM_uint32 major; + + /* XXX TODO import and validate name from inputToken */ + + if (ctx->acceptorName != GSS_C_NO_NAME) { + /* Send desired target name to acceptor */ + major = gssEapDisplayName(minor, ctx->acceptorName, + outputToken, NULL); + if (GSS_ERROR(major)) + return major; + } + + return GSS_S_CONTINUE_NEEDED; +} + +#ifdef GSSEAP_DEBUG +static OM_uint32 +eapGssSmAcceptVendorInfo(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx GSSEAP_UNUSED, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) +{ + fprintf(stderr, "GSS-EAP: vendor: %.*s\n", + (int)inputToken->length, (char *)inputToken->value); + + *minor = 0; + return GSS_S_CONTINUE_NEEDED; +} +#endif + + /* * Emit a identity EAP request to force the initiator (peer) to identify * itself. */ static OM_uint32 eapGssSmAcceptIdentity(OM_uint32 *minor, - gss_ctx_id_t ctx, gss_cred_id_t cred, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) + gss_buffer_t outputToken, + OM_uint32 *smFlags) { OM_uint32 major; - union { - struct eap_hdr pdu; - unsigned char data[5]; - } pkt; + struct wpabuf *reqData; gss_buffer_desc pktBuffer; + if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) { + *minor = GSSEAP_CRED_MECH_MISMATCH; + return GSS_S_BAD_MECH; + } + if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0) { *minor = GSSEAP_WRONG_SIZE; return GSS_S_DEFECTIVE_TOKEN; } - assert(ctx->acceptorName == GSS_C_NO_NAME); - - if (cred->name != GSS_C_NO_NAME) { - major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); - if (GSS_ERROR(major)) - return major; + reqData = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_IDENTITY, 0, + EAP_CODE_REQUEST, 0); + if (reqData == NULL) { + *minor = ENOMEM; + return GSS_S_FAILURE; } - pkt.pdu.code = EAP_CODE_REQUEST; - pkt.pdu.identifier = 0; - pkt.pdu.length = htons(sizeof(pkt.data)); - pkt.data[4] = EAP_TYPE_IDENTITY; - - pktBuffer.length = sizeof(pkt.data); - pktBuffer.value = pkt.data; + pktBuffer.length = wpabuf_len(reqData); + pktBuffer.value = (void *)wpabuf_head(reqData); major = duplicateBuffer(minor, &pktBuffer, outputToken); if (GSS_ERROR(major)) return major; - ctx->state = GSSEAP_STATE_AUTHENTICATE; + wpabuf_free(reqData); + + GSSEAP_SM_TRANSITION_NEXT(ctx); *minor = 0; + *smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL; + return GSS_S_CONTINUE_NEEDED; } /* + * Returns TRUE if the input token contains an EAP identity response. + */ +static int +isIdentityResponseP(gss_buffer_t inputToken) +{ + struct wpabuf respData; + + wpabuf_set(&respData, inputToken->value, inputToken->length); + + return (eap_get_type(&respData) == EAP_TYPE_IDENTITY); +} + +/* + * Save the asserted initiator identity from the EAP identity response. + */ +static OM_uint32 +importInitiatorIdentity(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_buffer_t inputToken) +{ + OM_uint32 tmpMinor; + struct wpabuf respData; + const unsigned char *pos; + size_t len; + gss_buffer_desc nameBuf; + + wpabuf_set(&respData, inputToken->value, inputToken->length); + + pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_IDENTITY, + &respData, &len); + if (pos == NULL) { + *minor = GSSEAP_PEER_BAD_MESSAGE; + return GSS_S_DEFECTIVE_TOKEN; + } + + nameBuf.value = (void *)pos; + nameBuf.length = len; + + gssEapReleaseName(&tmpMinor, &ctx->initiatorName); + + return gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME, + &ctx->initiatorName); +} + +/* + * Pass the asserted initiator identity to the authentication server. + */ +static OM_uint32 +setInitiatorIdentity(OM_uint32 *minor, + gss_ctx_id_t ctx, + VALUE_PAIR **vps) +{ + OM_uint32 major, tmpMinor; + gss_buffer_desc nameBuf; + + /* + * We should have got an EAP identity response, but if we didn't, then + * we will just avoid sending User-Name. Note that radsecproxy requires + * User-Name to be sent on every request (presumably so it can remain + * stateless). + */ + if (ctx->initiatorName != GSS_C_NO_NAME) { + major = gssEapDisplayName(minor, ctx->initiatorName, &nameBuf, NULL); + if (GSS_ERROR(major)) + return major; + + major = gssEapRadiusAddAvp(minor, vps, PW_USER_NAME, 0, &nameBuf); + if (GSS_ERROR(major)) + return major; + + gss_release_buffer(&tmpMinor, &nameBuf); + } + + *minor = 0; + return GSS_S_COMPLETE; +} + +/* * Pass the asserted acceptor identity to the authentication server. */ static OM_uint32 @@ -325,26 +466,34 @@ fail: */ static OM_uint32 eapGssSmAcceptAuthenticate(OM_uint32 *minor, - gss_ctx_id_t ctx, gss_cred_id_t cred, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) + gss_buffer_t outputToken, + OM_uint32 *smFlags) { OM_uint32 major, tmpMinor; struct rs_connection *rconn; struct rs_request *request = NULL; struct rs_packet *req = NULL, *resp = NULL; struct radius_packet *frreq, *frresp; - int sendAcceptorIdentity = 0; if (ctx->acceptorCtx.radContext == NULL) { /* May be NULL from an imported partial context */ major = createRadiusHandle(minor, cred, ctx); if (GSS_ERROR(major)) goto cleanup; + } - sendAcceptorIdentity = 1; + if (isIdentityResponseP(inputToken)) { + major = importInitiatorIdentity(minor, ctx, inputToken); + if (GSS_ERROR(major)) + return major; } rconn = ctx->acceptorCtx.radConn; @@ -355,11 +504,13 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, } frreq = rs_packet_frpkt(req); - if (sendAcceptorIdentity) { - major = setAcceptorIdentity(minor, ctx, &frreq->vps); - if (GSS_ERROR(major)) - goto cleanup; - } + major = setInitiatorIdentity(minor, ctx, &frreq->vps); + if (GSS_ERROR(major)) + goto cleanup; + + major = setAcceptorIdentity(minor, ctx, &frreq->vps); + if (GSS_ERROR(major)) + goto cleanup; major = gssEapRadiusAddAvp(minor, &frreq->vps, PW_EAP_MESSAGE, 0, inputToken); @@ -381,6 +532,7 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, } rs_request_add_reqpkt(request, req); + req = NULL; if (rs_request_send(request, &resp) != 0) { major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); @@ -391,9 +543,8 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, frresp = rs_packet_frpkt(resp); switch (frresp->code) { - case PW_AUTHENTICATION_ACK: case PW_ACCESS_CHALLENGE: - major = GSS_S_CONTINUE_NEEDED; + case PW_AUTHENTICATION_ACK: break; case PW_AUTHENTICATION_REJECT: *minor = GSSEAP_RADIUS_AUTH_FAILURE; @@ -425,134 +576,217 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, ctx->acceptorCtx.vps = frresp->vps; frresp->vps = NULL; - rs_conn_destroy(ctx->acceptorCtx.radConn); - ctx->acceptorCtx.radConn = NULL; - major = acceptReadyEap(minor, ctx, cred); if (GSS_ERROR(major)) goto cleanup; - ctx->state = GSSEAP_STATE_EXTENSIONS_REQ; + GSSEAP_SM_TRANSITION_NEXT(ctx); } - *minor = 0; major = GSS_S_CONTINUE_NEEDED; + *minor = 0; + *smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL; cleanup: - rs_request_destroy(request); + if (request != NULL) + rs_request_destroy(request); + if (req != NULL) + rs_packet_destroy(req); + if (resp != NULL) + rs_packet_destroy(resp); + if (GSSEAP_SM_STATE(ctx) == GSSEAP_STATE_INITIATOR_EXTS) { + assert(major == GSS_S_CONTINUE_NEEDED); + + rs_conn_destroy(ctx->acceptorCtx.radConn); + ctx->acceptorCtx.radConn = NULL; + } return major; } static OM_uint32 -eapGssSmAcceptExtensionsReq(OM_uint32 *minor, - gss_ctx_id_t ctx, - gss_cred_id_t cred, - gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) +eapGssSmAcceptGssChannelBindings(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) { - OM_uint32 major; + OM_uint32 major, tmpMinor; + gss_iov_buffer_desc iov[2]; - major = gssEapVerifyExtensions(minor, cred, ctx, chanBindings, inputToken); + iov[0].type = GSS_IOV_BUFFER_TYPE_DATA | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_STREAM; + iov[1].buffer = *inputToken; + + major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, + iov, 2, TOK_TYPE_WRAP); if (GSS_ERROR(major)) return major; - outputToken->length = 0; - outputToken->value = NULL; + if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS && + !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) { + major = GSS_S_BAD_BINDINGS; + *minor = GSSEAP_BINDINGS_MISMATCH; + } else { + major = GSS_S_CONTINUE_NEEDED; + *minor = 0; + } - ctx->state = GSSEAP_STATE_EXTENSIONS_RESP; + gss_release_buffer(&tmpMinor, &iov[0].buffer); - *minor = 0; - return GSS_S_CONTINUE_NEEDED; + return major; } +#ifdef GSSEAP_ENABLE_REAUTH static OM_uint32 -eapGssSmAcceptExtensionsResp(OM_uint32 *minor, - gss_ctx_id_t ctx, - gss_cred_id_t cred, - gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) +eapGssSmAcceptReauthCreds(OM_uint32 *minor, + gss_cred_id_t cred, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken, + OM_uint32 *smFlags GSSEAP_UNUSED) { OM_uint32 major; - major = gssEapMakeExtensions(minor, cred, ctx, chanBindings, outputToken); - if (GSS_ERROR(major)) - return major; - - ctx->state = GSSEAP_STATE_ESTABLISHED; + /* + * If we're built with fast reauthentication enabled, then + * fabricate a ticket from the initiator to ourselves. + */ + major = gssEapMakeReauthCreds(minor, ctx, cred, outputToken); + if (major == GSS_S_UNAVAILABLE) + major = GSS_S_COMPLETE; + if (major == GSS_S_COMPLETE) + major = GSS_S_CONTINUE_NEEDED; - *minor = 0; - return GSS_S_COMPLETE; + return major; } +#endif static OM_uint32 -eapGssSmAcceptEstablished(OM_uint32 *minor, - gss_ctx_id_t ctx, - gss_cred_id_t cred, - gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) +eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) { - /* Called with already established context */ - *minor = GSSEAP_CONTEXT_ESTABLISHED; - return GSS_S_BAD_STATUS; + GSSEAP_SM_TRANSITION_NEXT(ctx); + + *minor = 0; + + return GSS_S_CONTINUE_NEEDED; } static OM_uint32 -makeErrorToken(OM_uint32 *minor, - OM_uint32 majorStatus, - OM_uint32 minorStatus, - gss_buffer_t outputToken) +eapGssSmAcceptCompleteAcceptorExts(OM_uint32 *minor, + gss_cred_id_t cred GSSEAP_UNUSED, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech GSSEAP_UNUSED, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, + gss_channel_bindings_t chanBindings GSSEAP_UNUSED, + gss_buffer_t inputToken GSSEAP_UNUSED, + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags) { - unsigned char errorData[8]; - gss_buffer_desc errorBuffer; - - assert(GSS_ERROR(majorStatus)); - - /* - * Only return error codes that the initiator could have caused, - * to avoid information leakage. - */ - if (IS_RADIUS_ERROR(minorStatus)) { - /* Squash RADIUS error codes */ - minorStatus = GSSEAP_RADIUS_PROT_FAILURE; - } else if (!IS_WIRE_ERROR(minorStatus)) { - /* Don't return non-wire error codes */ - return GSS_S_COMPLETE; - } - - minorStatus -= ERROR_TABLE_BASE_eapg; + GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED); - store_uint32_be(majorStatus, &errorData[0]); - store_uint32_be(minorStatus, &errorData[4]); - - errorBuffer.length = sizeof(errorData); - errorBuffer.value = errorData; + *minor = 0; + *smFlags |= SM_FLAG_FORCE_SEND_TOKEN; - return duplicateBuffer(minor, &errorBuffer, outputToken); + return GSS_S_COMPLETE; } -static struct gss_eap_acceptor_sm { - enum gss_eap_token_type inputTokenType; - enum gss_eap_token_type outputTokenType; - OM_uint32 (*processToken)(OM_uint32 *, - gss_ctx_id_t, - gss_cred_id_t, - gss_buffer_t, - gss_channel_bindings_t, - gss_buffer_t); -} eapGssAcceptorSm[] = { - { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity }, - { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate }, - { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq }, - { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp }, - { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished }, - { TOK_TYPE_NONE, TOK_TYPE_CONTEXT_ERR, NULL }, +static struct gss_eap_sm eapGssAcceptorSm[] = { + { + ITOK_TYPE_ACCEPTOR_NAME_REQ, + ITOK_TYPE_ACCEPTOR_NAME_RESP, + GSSEAP_STATE_INITIAL, + 0, + eapGssSmAcceptAcceptorName + }, +#ifdef GSSEAP_DEBUG + { + ITOK_TYPE_VENDOR_INFO, + ITOK_TYPE_NONE, + GSSEAP_STATE_INITIAL, + 0, + eapGssSmAcceptVendorInfo, + }, +#endif #ifdef GSSEAP_ENABLE_REAUTH - { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth }, + { + ITOK_TYPE_REAUTH_REQ, + ITOK_TYPE_REAUTH_RESP, + GSSEAP_STATE_INITIAL, + 0, + eapGssSmAcceptGssReauth, + }, #endif + { + ITOK_TYPE_NONE, + ITOK_TYPE_EAP_REQ, + GSSEAP_STATE_INITIAL, + SM_ITOK_FLAG_REQUIRED, + eapGssSmAcceptIdentity, + }, + { + ITOK_TYPE_EAP_RESP, + ITOK_TYPE_EAP_REQ, + GSSEAP_STATE_AUTHENTICATE, + SM_ITOK_FLAG_REQUIRED, + eapGssSmAcceptAuthenticate + }, + { + ITOK_TYPE_GSS_CHANNEL_BINDINGS, + ITOK_TYPE_NONE, + GSSEAP_STATE_INITIATOR_EXTS, + SM_ITOK_FLAG_REQUIRED, + eapGssSmAcceptGssChannelBindings, + }, + { + ITOK_TYPE_NONE, + ITOK_TYPE_NONE, + GSSEAP_STATE_INITIATOR_EXTS, + 0, + eapGssSmAcceptCompleteInitiatorExts, + }, +#ifdef GSSEAP_ENABLE_REAUTH + { + ITOK_TYPE_NONE, + ITOK_TYPE_REAUTH_CREDS, + GSSEAP_STATE_ACCEPTOR_EXTS, + 0, + eapGssSmAcceptReauthCreds, + }, +#endif + { + ITOK_TYPE_NONE, + ITOK_TYPE_NONE, + GSSEAP_STATE_ACCEPTOR_EXTS, + 0, + eapGssSmAcceptCompleteAcceptorExts + }, }; OM_uint32 @@ -568,20 +802,17 @@ gss_accept_sec_context(OM_uint32 *minor, OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle) { - OM_uint32 major; - OM_uint32 tmpMajor, tmpMinor; + OM_uint32 major, tmpMinor; gss_ctx_id_t ctx = *context_handle; - struct gss_eap_acceptor_sm *sm = NULL; - gss_buffer_desc innerInputToken = GSS_C_EMPTY_BUFFER; - gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER; - enum gss_eap_token_type tokType; - int initialContextToken = 0; *minor = 0; output_token->length = 0; output_token->value = NULL; + if (src_name != NULL) + *src_name = GSS_C_NO_NAME; + if (input_token == GSS_C_NO_BUFFER || input_token->length == 0) { *minor = GSSEAP_TOK_TRUNC; return GSS_S_DEFECTIVE_TOKEN; @@ -592,7 +823,6 @@ gss_accept_sec_context(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - initialContextToken = 1; *context_handle = ctx; } @@ -618,57 +848,26 @@ gss_accept_sec_context(OM_uint32 *minor, GSSEAP_MUTEX_LOCK(&cred->mutex); - sm = &eapGssAcceptorSm[ctx->state]; - - major = gssEapVerifyToken(minor, ctx, input_token, - &tokType, &innerInputToken); - if (GSS_ERROR(major)) - goto cleanup; - - if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) { - *minor = GSSEAP_CRED_MECH_MISMATCH; - major = GSS_S_BAD_MECH; - goto cleanup; + if (cred->name != GSS_C_NO_NAME) { + major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); + if (GSS_ERROR(major)) + goto cleanup; } -#ifdef GSSEAP_ENABLE_REAUTH - /* - * If we're built with fast reauthentication support, it's valid - * for an initiator to send a GSS reauthentication token as its - * initial context token, causing us to short-circuit the state - * machine and process Kerberos GSS messages instead. - */ - if (tokType == TOK_TYPE_GSS_REAUTH && initialContextToken) { - ctx->state = GSSEAP_STATE_KRB_REAUTH; - } else -#endif - if (tokType != sm->inputTokenType) { - *minor = GSSEAP_WRONG_TOK_ID; - major = GSS_S_DEFECTIVE_TOKEN; + major = gssEapSmStep(minor, + cred, + ctx, + GSS_C_NO_NAME, + GSS_C_NO_OID, + 0, + GSS_C_INDEFINITE, + input_chan_bindings, + input_token, + output_token, + eapGssAcceptorSm, + sizeof(eapGssAcceptorSm) / sizeof(eapGssAcceptorSm[0])); + if (GSS_ERROR(major)) goto cleanup; - } - - do { - sm = &eapGssAcceptorSm[ctx->state]; - - major = (sm->processToken)(minor, - ctx, - cred, - &innerInputToken, - input_chan_bindings, - &innerOutputToken); - if (GSS_ERROR(major)) { - /* Possibly generate an error token */ - tmpMajor = makeErrorToken(&tmpMinor, major, *minor, &innerOutputToken); - if (GSS_ERROR(tmpMajor)) { - major = tmpMajor; - goto cleanup; - } - - sm = &eapGssAcceptorSm[GSSEAP_STATE_ERROR]; - goto send_token; - } - } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0); if (mech_type != NULL) { if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) @@ -692,18 +891,7 @@ gss_accept_sec_context(OM_uint32 *minor, } } - assert(ctx->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED); - -send_token: - if (innerOutputToken.value != NULL) { - tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, - sm->outputTokenType, output_token); - if (GSS_ERROR(tmpMajor)) { - major = tmpMajor; - *minor = tmpMinor; - goto cleanup; - } - } + assert(CTX_IS_ESTABLISHED(ctx) || major == GSS_S_CONTINUE_NEEDED); cleanup: if (cred != GSS_C_NO_CREDENTIAL) @@ -713,8 +901,6 @@ cleanup: if (GSS_ERROR(major)) gssEapReleaseContext(&tmpMinor, context_handle); - gss_release_buffer(&tmpMinor, &innerOutputToken); - return major; } @@ -733,35 +919,38 @@ acceptReadyKrb(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - if (cred->name != GSS_C_NO_NAME) { - major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); - if (GSS_ERROR(major)) - return major; - } - major = gssEapReauthComplete(minor, ctx, cred, mech, timeRec); if (GSS_ERROR(major)) return major; - ctx->state = GSSEAP_STATE_ESTABLISHED; - *minor = 0; return GSS_S_COMPLETE; } static OM_uint32 eapGssSmAcceptGssReauth(OM_uint32 *minor, - gss_ctx_id_t ctx, gss_cred_id_t cred, - gss_buffer_t inputToken, + gss_ctx_id_t ctx, + gss_name_t target GSSEAP_UNUSED, + gss_OID mech, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, gss_channel_bindings_t chanBindings, - gss_buffer_t outputToken) + gss_buffer_t inputToken, + gss_buffer_t outputToken, + OM_uint32 *smFlags) { OM_uint32 major, tmpMinor; gss_name_t krbInitiator = GSS_C_NO_NAME; - gss_OID mech = GSS_C_NO_OID; OM_uint32 gssFlags, timeRec = GSS_C_INDEFINITE; + /* + * If we're built with fast reauthentication support, it's valid + * for an initiator to send a GSS reauthentication token as its + * initial context token, causing us to short-circuit the state + * machine and process Kerberos GSS messages instead. + */ + ctx->flags |= CTX_FLAG_KRB_REAUTH; major = gssAcceptSecContext(minor, @@ -778,10 +967,19 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor, if (major == GSS_S_COMPLETE) { major = acceptReadyKrb(minor, ctx, cred, krbInitiator, mech, timeRec); + if (major == GSS_S_COMPLETE) { + GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED); + } + ctx->gssFlags = gssFlags; + } else if (GSS_ERROR(major) && + (*smFlags & SM_FLAG_INPUT_TOKEN_CRITICAL) == 0) { + /* pretend reauthentication attempt never happened */ + gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER); + ctx->flags &= ~(CTX_FLAG_KRB_REAUTH); + GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL); + major = GSS_S_CONTINUE_NEEDED; } - ctx->gssFlags = gssFlags; - gssReleaseName(&tmpMinor, &krbInitiator); return major;