X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=83d6c2de8df676edc4a7bbb11b25c3be59d82b4d;hb=4866125c4be79ec72fc388eabba01505786850b4;hp=01a07bc553473cc6d76e6cad9b162e6c7bca76d9;hpb=0dbffe887f9d0c5c712689575df07e364f2cddee;p=mech_eap.orig diff --git a/accept_sec_context.c b/accept_sec_context.c index 01a07bc..83d6c2d 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -32,15 +32,23 @@ #include "gssapiP_eap.h" -#define RC_CONFIG_FILE SYSCONFDIR "/radiusclient/radiusclient.conf" +#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_channel_bindings_t chanBindings, + gss_buffer_t outputToken); +#endif /* * Mark a context as ready for cryptographic operations */ static OM_uint32 -acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx) +acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) { - OM_uint32 major; + OM_uint32 major, tmpMinor; VALUE_PAIR *vp; gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; @@ -50,26 +58,29 @@ acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx) if (GSS_ERROR(major)) return major; - vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_USER_NAME, 0); + gssEapReleaseName(&tmpMinor, &ctx->initiatorName); + + vp = pairfind(ctx->acceptorCtx.avps, PW_USER_NAME); if (vp != NULL) { - nameBuf.length = vp->lvalue; - nameBuf.value = vp->strvalue; - } else if (ctx->initiatorName == GSS_C_NO_NAME) { + nameBuf.length = vp->length; + nameBuf.value = vp->vp_strvalue; + } else { ctx->gssFlags |= GSS_C_ANON_FLAG; } - if (nameBuf.length != 0 || ctx->initiatorName == GSS_C_NO_NAME) { - major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME, - &ctx->initiatorName); - if (GSS_ERROR(major)) - return major; - } + major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME, + &ctx->initiatorName); + if (GSS_ERROR(major)) + return major; + + ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx); - vp = rc_avpair_get(ctx->acceptorCtx.avps, PW_MSCHAP2_SUCCESS, 0); - if (ctx->encryptionType != ENCTYPE_NULL && vp != NULL) { + major = gssEapRadiusGetRawAvp(minor, ctx->acceptorCtx.avps, + PW_MS_MPPE_SEND_KEY, VENDORPEC_MS, &vp); + if (major == GSS_S_COMPLETE && ctx->encryptionType != ENCTYPE_NULL) { major = gssEapDeriveRfc3961Key(minor, - (unsigned char *)vp->strvalue, - vp->lvalue, + vp->vp_octets, + vp->length, ctx->encryptionType, &ctx->rfc3961Key); if (GSS_ERROR(major)) @@ -86,6 +97,7 @@ acceptReady(OM_uint32 *minor, gss_ctx_id_t ctx) * material it seems confusing to the caller to advertise this. */ ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG); + ctx->encryptionType = ENCTYPE_NULL; } major = sequenceInit(minor, @@ -108,37 +120,19 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, gss_buffer_t outputToken) { OM_uint32 major; - rc_handle *rh; union { struct eap_hdr pdu; unsigned char data[5]; } pkt; gss_buffer_desc pktBuffer; - char *config = RC_CONFIG_FILE; if (inputToken != GSS_C_NO_BUFFER && inputToken->length != 0) return GSS_S_DEFECTIVE_TOKEN; - assert(ctx->acceptorCtx.radHandle == NULL); - - if (cred != GSS_C_NO_CREDENTIAL && cred->radiusConfigFile != NULL) - config = cred->radiusConfigFile; - - rh = ctx->acceptorCtx.radHandle = rc_read_config(config); - if (rh == NULL) { - *minor = errno; - return GSS_S_FAILURE; - } - - if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary")) != 0) { - *minor = errno; - return GSS_S_FAILURE; - } + assert(ctx->acceptorName == GSS_C_NO_NAME); - if (ctx->acceptorName == GSS_C_NO_NAME && - cred != GSS_C_NO_CREDENTIAL && - cred->name != GSS_C_NO_NAME) { - major = gss_duplicate_name(minor, cred->name, &ctx->acceptorName); + if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) { + major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName); if (GSS_ERROR(major)) return major; } @@ -161,28 +155,88 @@ eapGssSmAcceptIdentity(OM_uint32 *minor, } static OM_uint32 -importInitiatorIdentity(OM_uint32 *minor, - gss_ctx_id_t ctx, - gss_buffer_t inputToken, - gss_buffer_t nameBuf) +setAcceptorIdentity(OM_uint32 *minor, + gss_ctx_id_t ctx, + VALUE_PAIR **avps) { - OM_uint32 major, tmpMinor; - struct eap_hdr *pdu = (struct eap_hdr *)inputToken->value; - unsigned char *pos = (unsigned char *)(pdu + 1); - gss_name_t name; + OM_uint32 major; + gss_buffer_desc nameBuf; + krb5_context krbContext = NULL; + krb5_principal krbPrinc; + struct rs_handle *rh = ctx->acceptorCtx.radHandle; + + assert(rh != NULL); - assert(pdu->code == EAP_CODE_RESPONSE); - assert(pos[0] == EAP_TYPE_IDENTITY); + /* Awaits further specification */ + if (ctx->acceptorName == GSS_C_NO_NAME) + return GSS_S_COMPLETE; + + GSSEAP_KRB_INIT(&krbContext); + + krbPrinc = ctx->acceptorName->krbPrincipal; + assert(krbPrinc != NULL); - nameBuf->value = pos + 1; - nameBuf->length = inputToken->length - sizeof(*pdu) - 1; + if (krb5_princ_size(krbContext, krbPrinc) < 2) + return GSS_S_BAD_NAME; - major = gssEapImportName(minor, nameBuf, GSS_C_NT_USER_NAME, &name); + /* Acceptor-Service-Name */ + krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0), &nameBuf); + + major = gssEapRadiusAddAvp(minor, rh, avps, + PW_GSS_ACCEPTOR_SERVICE_NAME, + VENDORPEC_UKERNA, + &nameBuf); if (GSS_ERROR(major)) return major; - gssEapReleaseName(&tmpMinor, &ctx->initiatorName); - ctx->initiatorName = name; + /* Acceptor-Host-Name */ + krbDataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1), &nameBuf); + + major = gssEapRadiusAddAvp(minor, rh, avps, + PW_GSS_ACCEPTOR_HOST_NAME, + VENDORPEC_UKERNA, + &nameBuf); + if (GSS_ERROR(major)) + return major; + + if (krb5_princ_size(krbContext, krbPrinc) > 2) { + /* Acceptor-Service-Specific */ + krb5_principal_data ssiPrinc = *krbPrinc; + char *ssi; + + krb5_princ_size(krbContext, &ssiPrinc) -= 2; + krb5_princ_name(krbContext, &ssiPrinc) += 2; + + *minor = krb5_unparse_name_flags(krbContext, &ssiPrinc, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi); + if (*minor != 0) + return GSS_S_FAILURE; + + nameBuf.value = ssi; + nameBuf.length = strlen(ssi); + + major = gssEapRadiusAddAvp(minor, rh, avps, + PW_GSS_ACCEPTOR_SERVICE_SPECIFIC, + VENDORPEC_UKERNA, + &nameBuf); + + if (GSS_ERROR(major)) { + krb5_free_unparsed_name(krbContext, ssi); + return major; + } + krb5_free_unparsed_name(krbContext, ssi); + } + + krbDataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc), &nameBuf); + if (nameBuf.length != 0) { + /* Acceptor-Realm-Name */ + major = gssEapRadiusAddAvp(minor, rh, avps, + PW_GSS_ACCEPTOR_REALM_NAME, + VENDORPEC_UKERNA, + &nameBuf); + if (GSS_ERROR(major)) + return major; + } return GSS_S_COMPLETE; } @@ -196,143 +250,201 @@ eapGssSmAcceptAuthenticate(OM_uint32 *minor, gss_buffer_t outputToken) { OM_uint32 major, tmpMinor; - int code; - VALUE_PAIR *send = NULL; - VALUE_PAIR *received = NULL; - rc_handle *rh = ctx->acceptorCtx.radHandle; - char msgBuffer[4096]; - struct eap_hdr *pdu; - unsigned char *pos; - gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER; - - pdu = (struct eap_hdr *)inputToken->value; - pos = (unsigned char *)(pdu + 1); - - if (inputToken->length > sizeof(*pdu) && - pdu->code == EAP_CODE_RESPONSE && - pos[0] == EAP_TYPE_IDENTITY) { - major = importInitiatorIdentity(minor, ctx, inputToken, &nameBuf); + struct rs_handle *rh; + struct rs_connection *rconn; + struct rs_packet *req = NULL, *resp = NULL; + struct radius_packet *frreq, *frresp; + int sendAcceptorIdentity = 0; + + if (ctx->acceptorCtx.radHandle == NULL) { + /* May be NULL from an imported partial context */ + major = gssEapRadiusAllocConn(minor, cred, ctx); if (GSS_ERROR(major)) goto cleanup; - major = addRadiusAttributeFromBuffer(minor, rh, &send, - PW_USER_NAME, &nameBuf); + sendAcceptorIdentity = 1; + } + + rh = ctx->acceptorCtx.radHandle; + rconn = ctx->acceptorCtx.radConn; + + if (rs_packet_create_acc_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 = addRadiusAttributeFromBuffer(minor, rh, &send, PW_EAP_MESSAGE, - inputToken); + major = gssEapRadiusAddAvp(minor, rh, &frreq->vps, PW_EAP_MESSAGE, 0, inputToken); if (GSS_ERROR(major)) goto cleanup; - if (ctx->acceptorCtx.lastStatus == PW_ACCESS_CHALLENGE) { - major = addRadiusAttributeFromBuffer(minor, rh, &send, PW_STATE, - &ctx->acceptorCtx.state); + if (ctx->acceptorCtx.state.length != 0) { + major = gssEapRadiusAddAvp(minor, rh, &frreq->vps, PW_STATE, 0, + &ctx->acceptorCtx.state); if (GSS_ERROR(major)) goto cleanup; gss_release_buffer(&tmpMinor, &ctx->acceptorCtx.state); } - code = rc_auth(rh, 0, send, &received, msgBuffer); - if (code != 0) { - *minor = errno; - major = GSS_S_UNAVAILABLE; + if (rs_packet_send(req, NULL) != 0) { + major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); goto cleanup; } + req = NULL; - ctx->acceptorCtx.lastStatus = code; - - if (code == OK_RC || code == PW_ACCESS_CHALLENGE) { - major = getBufferFromRadiusAttributes(minor, received, PW_EAP_MESSAGE, - outputToken); - if (GSS_ERROR(major)) - goto cleanup; - - if (code == PW_ACCESS_CHALLENGE) { - major = getBufferFromRadiusAttributes(minor, received, PW_STATE, - &ctx->acceptorCtx.state); - if (GSS_ERROR(major)) - goto cleanup; - } + if (rs_conn_receive_packet(rconn, &resp) != 0) { + major = gssEapRadiusMapError(minor, rs_err_conn_pop(rconn)); + goto cleanup; + } + frresp = rs_packet_frpkt(resp); + switch (frresp->code) { + case PW_AUTHENTICATION_ACK: + case PW_ACCESS_CHALLENGE: major = GSS_S_CONTINUE_NEEDED; - } else { + break; + case PW_AUTHENTICATION_REJECT: + major = GSS_S_DEFECTIVE_CREDENTIAL; + goto cleanup; + break; + default: major = GSS_S_FAILURE; goto cleanup; + break; } - if (code == OK_RC) { - ctx->acceptorCtx.avps = received; - received = NULL; + major = gssEapRadiusGetAvp(minor, frresp->vps, PW_EAP_MESSAGE, 0, + outputToken, TRUE); + if ((major == GSS_S_UNAVAILABLE && frresp->code != PW_AUTHENTICATION_ACK) || + GSS_ERROR(major)) + goto cleanup; + + if (frresp->code == PW_ACCESS_CHALLENGE) { + major = gssEapRadiusGetAvp(minor, frresp->vps, PW_STATE, 0, + &ctx->acceptorCtx.state, TRUE); + if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major)) + goto cleanup; + } else { + ctx->acceptorCtx.avps = frresp->vps; + frresp->vps = NULL; - major = acceptReady(minor, ctx); + major = acceptReadyEap(minor, ctx, cred); if (GSS_ERROR(major)) goto cleanup; - ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS; - major = GSS_S_CONTINUE_NEEDED; + ctx->state = EAP_STATE_EXTENSIONS_REQ; } + major = GSS_S_CONTINUE_NEEDED; + cleanup: - if (received != NULL) - rc_avpair_free(received); + rs_packet_destroy(req); + rs_packet_destroy(resp); return major; } static OM_uint32 -eapGssSmAcceptGssChannelBindings(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) +acceptGssChannelBindings(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + gss_buffer_t inputToken, + gss_channel_bindings_t chanBindings) { - OM_uint32 major; + OM_uint32 major, tmpMinor; gss_iov_buffer_desc iov[2]; - outputToken->length = 0; - outputToken->value = NULL; + iov[0].type = GSS_IOV_BUFFER_TYPE_DATA | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; - if (chanBindings == GSS_C_NO_CHANNEL_BINDINGS) { - ctx->state = EAP_STATE_ESTABLISHED; - return GSS_S_COMPLETE; - } + iov[1].type = GSS_IOV_BUFFER_TYPE_STREAM; + iov[1].buffer = *inputToken; - if (inputToken->length < 14) { - return GSS_S_DEFECTIVE_TOKEN; + major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, + iov, 2, TOK_TYPE_WRAP); + if (GSS_ERROR(major)) + return major; + + if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS && + !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) { + major = GSS_S_BAD_BINDINGS; + } else { + major = GSS_S_CONTINUE_NEEDED; } - iov[0].type = GSS_IOV_BUFFER_TYPE_DATA; - iov[0].buffer.length = 0; - iov[0].buffer.value = NULL; + gss_release_buffer(&tmpMinor, &iov[0].buffer); + + 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) +{ + OM_uint32 major; + + outputToken->length = 0; + outputToken->value = NULL; - if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) - iov[0].buffer = chanBindings->application_data; + major = acceptGssChannelBindings(minor, ctx, cred, inputToken, + chanBindings); + if (GSS_ERROR(major)) + return major; - iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER; - iov[1].buffer.length = 16; - iov[1].buffer.value = (unsigned char *)inputToken->value - 2; + ctx->state = EAP_STATE_EXTENSIONS_RESP; - assert(load_uint16_be(iov[1].buffer.value) == TOK_TYPE_GSS_CB); + return GSS_S_CONTINUE_NEEDED; +} - iov[2].type = GSS_IOV_BUFFER_TYPE_TRAILER; - iov[2].buffer.length = inputToken->length - 14; - iov[2].buffer.value = (unsigned char *)inputToken->value + 14; +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) +{ + OM_uint32 major, tmpMinor; + gss_buffer_desc credsToken = GSS_C_EMPTY_BUFFER; + +#ifdef GSSEAP_ENABLE_REAUTH + /* + * If we're built with fast reauthentication enabled, then + * fabricate a ticket from the initiator to ourselves. + * Otherwise return an empty token. + */ + major = gssEapMakeReauthCreds(minor, ctx, cred, &credsToken); + if (GSS_ERROR(major)) + return major; +#else + credsToken.value = ""; +#endif /* GSSEAP_ENABLE_REAUTH */ - major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, - iov, 3, TOK_TYPE_GSS_CB); - if (major == GSS_S_COMPLETE) { - ctx->state = EAP_STATE_ESTABLISHED; + major = duplicateBuffer(minor, &credsToken, outputToken); + if (GSS_ERROR(major)) { + gss_release_buffer(&tmpMinor, &credsToken); + return major; } -#if 0 - gss_release_buffer(&tmpMinor, &iov[0].buffer); +#ifdef GSSEAP_ENABLE_REAUTH + gss_release_buffer(&tmpMinor, &credsToken); #endif - return major; + ctx->state = EAP_STATE_ESTABLISHED; + + return GSS_S_COMPLETE; } static OM_uint32 @@ -358,10 +470,14 @@ static struct gss_eap_acceptor_sm { 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_GSS_CB, TOK_TYPE_NONE, eapGssSmAcceptGssChannelBindings }, - { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished }, + { 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 }, +#ifdef GSSEAP_ENABLE_REAUTH + { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth }, +#endif }; OM_uint32 @@ -383,16 +499,14 @@ gss_accept_sec_context(OM_uint32 *minor, 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 (cred != GSS_C_NO_CREDENTIAL && !(cred->flags & CRED_FLAG_ACCEPT)) { - return GSS_S_NO_CRED; - } - if (input_token == GSS_C_NO_BUFFER || input_token->length == 0) { return GSS_S_DEFECTIVE_TOKEN; } @@ -402,24 +516,50 @@ 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) { + major = GSS_S_NO_CRED; + goto cleanup; + } + } + sm = &eapGssAcceptorSm[ctx->state]; major = gssEapVerifyToken(minor, ctx, input_token, - sm->inputTokenType, &innerInputToken); + &tokType, &innerInputToken); if (GSS_ERROR(major)) goto cleanup; - /* If credentials were provided, check they're usable with this mech */ if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) { major = GSS_S_BAD_MECH; 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 = EAP_STATE_KRB_REAUTH_GSS; + } else +#endif + if (tokType != sm->inputTokenType) { + major = GSS_S_DEFECTIVE_TOKEN; + goto cleanup; + } + do { sm = &eapGssAcceptorSm[ctx->state]; @@ -437,7 +577,7 @@ gss_accept_sec_context(OM_uint32 *minor, if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type); } - if (innerOutputToken.length != 0) { + if (innerOutputToken.value != NULL) { tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken, sm->outputTokenType, output_token); if (GSS_ERROR(tmpMajor)) { @@ -453,17 +593,19 @@ gss_accept_sec_context(OM_uint32 *minor, if (major == GSS_S_COMPLETE) { if (src_name != NULL && ctx->initiatorName != GSS_C_NO_NAME) { - major = gss_duplicate_name(&tmpMinor, ctx->initiatorName, src_name); + major = gssEapDuplicateName(&tmpMinor, ctx->initiatorName, src_name); if (GSS_ERROR(major)) goto cleanup; } 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); cleanup: + if (cred != GSS_C_NO_CREDENTIAL) + GSSEAP_MUTEX_UNLOCK(&cred->mutex); GSSEAP_MUTEX_UNLOCK(&ctx->mutex); if (GSS_ERROR(major)) @@ -474,3 +616,75 @@ cleanup: return major; } +#ifdef GSSEAP_ENABLE_REAUTH +static OM_uint32 +acceptReadyKrb(OM_uint32 *minor, + gss_ctx_id_t ctx, + gss_cred_id_t cred, + const gss_name_t initiator, + const gss_OID mech, + OM_uint32 timeRec) +{ + OM_uint32 major; + + major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName); + if (GSS_ERROR(major)) + return major; + + if (cred != GSS_C_NO_CREDENTIAL && 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 = EAP_STATE_ESTABLISHED; + + 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_channel_bindings_t chanBindings, + 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 (cred != GSS_C_NO_CREDENTIAL) + krbCred = cred->krbCred; + + major = gssAcceptSecContext(minor, + &ctx->kerberosCtx, + krbCred, + inputToken, + chanBindings, + &krbInitiator, + &mech, + outputToken, + &gssFlags, + &timeRec, + NULL); + if (major == GSS_S_COMPLETE) { + major = acceptReadyKrb(minor, ctx, cred, + krbInitiator, mech, timeRec); + } + + ctx->gssFlags = gssFlags; + + gssReleaseName(&tmpMinor, &krbInitiator); + + return major; +} +#endif /* GSSEAP_ENABLE_REAUTH */