X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=6d6564757de1fd85c81a9f381a964b69e1313c87;hb=938e32459851eae0b4580b067348c39ed5921fd8;hp=2b2d9958dbd6de493c7cec604a1e10aef566503f;hpb=1ebd478024dd1b85c842db0dedb1c5c379b445bd;p=mech_eap.git diff --git a/accept_sec_context.c b/accept_sec_context.c index 2b2d995..6d65647 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, JANET(UK) + * Copyright (c) 2011, JANET(UK) * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,14 @@ #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 __attribute__((__unused__)), + gss_OID mech __attribute__((__unused__)), + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, gss_buffer_t outputToken); #endif @@ -74,7 +78,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; @@ -107,7 +113,11 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) if (GSS_ERROR(major)) return major; - ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx); + major = gssEapCreateAttrContext(minor, cred, ctx, + &ctx->initiatorName->attrCtx, + &ctx->expiryTime); + if (GSS_ERROR(major)) + return major; *minor = 0; return GSS_S_COMPLETE; @@ -119,19 +129,25 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) */ 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 __attribute__((__unused__)), + gss_OID mech __attribute__((__unused__)), + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), + gss_channel_bindings_t chanBindings __attribute__((__unused__)), gss_buffer_t inputToken, - gss_channel_bindings_t chanBindings, gss_buffer_t outputToken) { 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; @@ -139,28 +155,108 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, assert(ctx->acceptorName == GSS_C_NO_NAME); - if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) { + if (cred->name != GSS_C_NO_NAME) { major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); if (GSS_ERROR(major)) return major; } - pkt.pdu.code = EAP_CODE_REQUEST; - pkt.pdu.identifier = 0; - pkt.pdu.length = htons(sizeof(pkt.data)); - pkt.data[4] = EAP_TYPE_IDENTITY; + reqData = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_IDENTITY, 0, + EAP_CODE_REQUEST, 0); + if (reqData == NULL) { + *minor = ENOMEM; + return GSS_S_FAILURE; + } - 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 = EAP_STATE_AUTHENTICATE; + wpabuf_free(reqData); *minor = 0; - return GSS_S_CONTINUE_NEEDED; + return GSS_S_COMPLETE; /* advance state */ +} + +/* + * 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; } /* @@ -193,10 +289,10 @@ setAcceptorIdentity(OM_uint32 *minor, krbPrinc = ctx->acceptorName->krbPrincipal; assert(krbPrinc != NULL); - assert(krb5_princ_size(krbContext, krbPrinc) >= 2); + assert(KRB_PRINC_LENGTH(krbPrinc) >= 2); /* Acceptor-Service-Name */ - krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf); + krbPrincComponentToGssBuffer(krbPrinc, 0, &nameBuf); major = gssEapRadiusAddAvp(minor, vps, PW_GSS_ACCEPTOR_SERVICE_NAME, @@ -206,7 +302,7 @@ setAcceptorIdentity(OM_uint32 *minor, return major; /* Acceptor-Host-Name */ - krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf); + krbPrincComponentToGssBuffer(krbPrinc, 1, &nameBuf); major = gssEapRadiusAddAvp(minor, vps, PW_GSS_ACCEPTOR_HOST_NAME, @@ -215,13 +311,13 @@ setAcceptorIdentity(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - if (krb5_princ_size(krbContext, krbPrinc) > 2) { + if (KRB_PRINC_LENGTH(krbPrinc) > 2) { /* Acceptor-Service-Specific */ krb5_principal_data ssiPrinc = *krbPrinc; char *ssi; - krb5_princ_size(krbContext, &ssiPrinc) -= 2; - krb5_princ_name(krbContext, &ssiPrinc) += 2; + KRB_PRINC_LENGTH(&ssiPrinc) -= 2; + KRB_PRINC_NAME(&ssiPrinc) += 2; *minor = krb5_unparse_name_flags(krbContext, &ssiPrinc, KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi); @@ -243,7 +339,7 @@ setAcceptorIdentity(OM_uint32 *minor, krb5_free_unparsed_name(krbContext, ssi); } - krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf); + krbPrincRealmToGssBuffer(krbPrinc, &nameBuf); if (nameBuf.length != 0) { /* Acceptor-Realm-Name */ major = gssEapRadiusAddAvp(minor, vps, @@ -280,12 +376,10 @@ createRadiusHandle(OM_uint32 *minor, return GSS_S_FAILURE; } - if (cred != GSS_C_NO_CREDENTIAL) { - if (cred->radiusConfigFile != NULL) - configFile = cred->radiusConfigFile; - if (cred->radiusConfigStanza != NULL) - configStanza = cred->radiusConfigStanza; - } + if (cred->radiusConfigFile != NULL) + configFile = cred->radiusConfigFile; + if (cred->radiusConfigStanza != NULL) + configStanza = cred->radiusConfigStanza; ralloc.calloc = GSSEAP_CALLOC; ralloc.malloc = GSSEAP_MALLOC; @@ -304,15 +398,12 @@ createRadiusHandle(OM_uint32 *minor, goto fail; } - /* XXX TODO rs_conn_select_server does not exist yet */ -#if 0 if (actx->radServer != NULL) { - if (rs_conn_select_server(actx->radConn, actx->radServer) != 0) { + if (rs_conn_select_peer(actx->radConn, actx->radServer) != 0) { err = rs_err_conn_pop(actx->radConn); goto fail; } } -#endif *minor = 0; return GSS_S_COMPLETE; @@ -326,10 +417,14 @@ fail: */ static OM_uint32 eapGssSmAcceptAuthenticate(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 __attribute__((__unused__)), + gss_OID mech __attribute__((__unused__)), + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, gss_buffer_t outputToken) { OM_uint32 major, tmpMinor; @@ -337,30 +432,35 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, 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; - if (rs_packet_create_acc_request(rconn, &req, NULL, NULL) != 0) { + if (rs_packet_create_authn_request(rconn, &req, NULL, NULL) != 0) { major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); goto cleanup; } 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); @@ -376,8 +476,15 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_release_buffer(&tmpMinor, &ctx->acceptorCtx.state); } - if (rs_request_create(rconn, &request) != 0 || - rs_request_send(request, req, &resp) != 0) { + if (rs_request_create(rconn, &request) != 0) { + major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); + goto cleanup; + } + + rs_request_add_reqpkt(request, req); + req = NULL; + + if (rs_request_send(request, &resp) != 0) { major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); goto cleanup; } @@ -388,7 +495,6 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, switch (frresp->code) { case PW_AUTHENTICATION_ACK: case PW_ACCESS_CHALLENGE: - major = GSS_S_CONTINUE_NEEDED; break; case PW_AUTHENTICATION_REJECT: *minor = GSSEAP_RADIUS_AUTH_FAILURE; @@ -416,6 +522,8 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, &ctx->acceptorCtx.state, TRUE); if (GSS_ERROR(major) && *minor != GSSEAP_NO_SUCH_ATTR) goto cleanup; + + major = GSS_S_CONTINUE_NEEDED; } else { ctx->acceptorCtx.vps = frresp->vps; frresp->vps = NULL; @@ -427,144 +535,154 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, if (GSS_ERROR(major)) goto cleanup; - ctx->state = EAP_STATE_EXTENSIONS_REQ; + major = GSS_S_COMPLETE; /* advance state */ } - *minor = 0; - major = GSS_S_CONTINUE_NEEDED; - cleanup: - rs_request_destroy(request); + if (request != NULL) + rs_request_destroy(request); + if (req != NULL) + rs_packet_destroy(req); 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, + gss_ctx_id_t ctx, + gss_name_t target __attribute__((__unused__)), + gss_OID mech __attribute__((__unused__)), + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), + gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, + gss_buffer_t outputToken) { - 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; + return GSS_S_BAD_BINDINGS; - 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; /* process additional extensions */ + *minor = 0; + } - ctx->state = EAP_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 __attribute__((__unused__)), + gss_OID mech __attribute__((__unused__)), + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), + gss_channel_bindings_t chanBindings __attribute__((__unused__)), + gss_buffer_t inputToken, + gss_buffer_t outputToken) { OM_uint32 major; - major = gssEapMakeExtensions(minor, cred, ctx, chanBindings, outputToken); + /* + * If we're built with fast reauthentication enabled, then + * fabricate a ticket from the initiator to ourselves. + */ + major = gssEapMakeReauthCreds(minor, ctx, cred, outputToken); if (GSS_ERROR(major)) return major; - ctx->state = EAP_STATE_ESTABLISHED; - *minor = 0; - return GSS_S_COMPLETE; -} - -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) -{ - /* Called with already established context */ - *minor = GSSEAP_CONTEXT_ESTABLISHED; - return GSS_S_BAD_STATUS; + return GSS_S_CONTINUE_NEEDED; /* process additional extensions */ } +#endif static OM_uint32 -makeErrorToken(OM_uint32 *minor, - OM_uint32 majorStatus, - OM_uint32 minorStatus, - gss_buffer_t outputToken) +eapGssSmAcceptNegoExtFinished(OM_uint32 *minor, + gss_cred_id_t cred, + gss_ctx_id_t ctx, + gss_name_t target __attribute__((__unused__)), + gss_OID mech __attribute__((__unused__)), + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), + gss_channel_bindings_t chanBindings __attribute__((__unused__)), + gss_buffer_t inputToken, + gss_buffer_t outputToken) { - 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. - */ - switch (minorStatus) { - case GSSEAP_WRONG_SIZE: - case GSSEAP_WRONG_MECH: - case GSSEAP_BAD_TOK_HEADER: - case GSSEAP_TOK_TRUNC: - case GSSEAP_BAD_DIRECTION: - case GSSEAP_WRONG_TOK_ID: - case GSSEAP_REFLECT: - case GSSEAP_CRIT_EXT_UNAVAILABLE: - case GSSEAP_MISSING_REQUIRED_EXT: - case GSSEAP_KEY_UNAVAILABLE: - case GSSEAP_KEY_TOO_SHORT: - case GSSEAP_RADIUS_AUTH_FAILURE: - case GSSEAP_UNKNOWN_RADIUS_CODE: - case GSSEAP_MISSING_EAP_REQUEST: - break; - default: - if (IS_RADIUS_ERROR(minorStatus)) - /* Squash RADIUS error codes */ - minorStatus = GSSEAP_GENERIC_RADIUS_ERROR; - else - /* Don't return system error codes */ - return GSS_S_COMPLETE; - } - - minorStatus -= ERROR_TABLE_BASE_eapg; - - store_uint32_be(majorStatus, &errorData[0]); - store_uint32_be(minorStatus, &errorData[4]); - - errorBuffer.length = sizeof(errorData); - errorBuffer.value = errorData; - - return duplicateBuffer(minor, &errorBuffer, outputToken); + *minor = 0; + return GSS_S_COMPLETE; /* advance state */ } -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[] = { #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, /* critical */ + 0, /* required */ + eapGssSmAcceptGssReauth, + }, #endif + { + ITOK_TYPE_NONE, + ITOK_TYPE_EAP_REQ, + GSSEAP_STATE_INITIAL, + 1, /* critical */ + 1, /* required */ + eapGssSmAcceptIdentity, + }, + { + ITOK_TYPE_EAP_RESP, + ITOK_TYPE_EAP_REQ, + GSSEAP_STATE_AUTHENTICATE, + 1, /* critical */ + 1, /* required */ + eapGssSmAcceptAuthenticate + }, + { + ITOK_TYPE_GSS_CHANNEL_BINDINGS, + ITOK_TYPE_NONE, + GSSEAP_STATE_NEGO_EXT, + 1, /* critical */ + 1, /* required */ + eapGssSmAcceptGssChannelBindings, + }, + { + ITOK_TYPE_NONE, + ITOK_TYPE_REAUTH_CREDS, + GSSEAP_STATE_NEGO_EXT, + 0, /* critical */ + 0, /* required */ + eapGssSmAcceptReauthCreds, + }, + { + ITOK_TYPE_NONE, + ITOK_TYPE_NONE, + GSSEAP_STATE_NEGO_EXT, + 1, /* critical */ + 1, /* required */ + eapGssSmAcceptNegoExtFinished + }, }; OM_uint32 @@ -580,20 +698,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; @@ -604,74 +719,45 @@ gss_accept_sec_context(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - initialContextToken = 1; *context_handle = ctx; } GSSEAP_MUTEX_LOCK(&ctx->mutex); - /* Validate and lock credentials */ - if (cred != GSS_C_NO_CREDENTIAL) { - GSSEAP_MUTEX_LOCK(&cred->mutex); - - if ((cred->flags & CRED_FLAG_ACCEPT) == 0) { - *minor = GSSEAP_CRED_USAGE_MISMATCH; - major = GSS_S_NO_CRED; - goto cleanup; + if (cred == GSS_C_NO_CREDENTIAL) { + if (ctx->defaultCred == GSS_C_NO_CREDENTIAL) { + major = gssEapAcquireCred(minor, + GSS_C_NO_NAME, + GSS_C_NO_BUFFER, + GSS_C_INDEFINITE, + GSS_C_NO_OID_SET, + GSS_C_ACCEPT, + &ctx->defaultCred, + NULL, + NULL); + if (GSS_ERROR(major)) + goto cleanup; } - } - - 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; + cred = ctx->defaultCred; } -#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 = EAP_STATE_KRB_REAUTH_GSS; - } else -#endif - if (tokType != sm->inputTokenType) { - *minor = GSSEAP_WRONG_TOK_ID; - major = GSS_S_DEFECTIVE_TOKEN; + GSSEAP_MUTEX_LOCK(&cred->mutex); + + 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[EAP_STATE_ERROR]; - goto send_token; - } - } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0); if (mech_type != NULL) { if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) @@ -695,18 +781,7 @@ gss_accept_sec_context(OM_uint32 *minor, } } - assert(ctx->state == EAP_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->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED); cleanup: if (cred != GSS_C_NO_CREDENTIAL) @@ -716,8 +791,6 @@ cleanup: if (GSS_ERROR(major)) gssEapReleaseContext(&tmpMinor, context_handle); - gss_release_buffer(&tmpMinor, &innerOutputToken); - return major; } @@ -732,11 +805,11 @@ acceptReadyKrb(OM_uint32 *minor, { OM_uint32 major; - major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName); + major = gssEapGlueToMechName(minor, ctx, initiator, &ctx->initiatorName); if (GSS_ERROR(major)) return major; - if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) { + if (cred->name != GSS_C_NO_NAME) { major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); if (GSS_ERROR(major)) return major; @@ -746,34 +819,40 @@ acceptReadyKrb(OM_uint32 *minor, if (GSS_ERROR(major)) return major; - ctx->state = EAP_STATE_ESTABLISHED; + ctx->state = GSSEAP_STATE_NEGO_EXT; /* skip */ *minor = 0; - return GSS_S_COMPLETE; + return GSS_S_COMPLETE; /* advance state */ } 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 __attribute__((__unused__)), + gss_OID mech, + OM_uint32 reqFlags __attribute__((__unused__)), + OM_uint32 timeReq __attribute__((__unused__)), gss_channel_bindings_t chanBindings, + gss_buffer_t inputToken, gss_buffer_t outputToken) { OM_uint32 major, tmpMinor; - gss_cred_id_t krbCred = GSS_C_NO_CREDENTIAL; gss_name_t krbInitiator = GSS_C_NO_NAME; - gss_OID mech = GSS_C_NO_OID; OM_uint32 gssFlags, timeRec = GSS_C_INDEFINITE; - ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS; + /* + * 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 (cred != GSS_C_NO_CREDENTIAL) - krbCred = cred->krbCred; + ctx->flags |= CTX_FLAG_KRB_REAUTH; major = gssAcceptSecContext(minor, &ctx->kerberosCtx, - krbCred, + cred->krbCred, inputToken, chanBindings, &krbInitiator,