X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=afbfb3f901ce25040d5bda81fbe7e642825dcce8;hb=refs%2Fheads%2Fddf-name;hp=5da5ea6cae39cec2e5558af78e9916f74f850336;hpb=c17108e0a6372a22b6538b9cf1aeb5a5822e60f9;p=mech_eap.orig diff --git a/accept_sec_context.c b/accept_sec_context.c index 5da5ea6..afbfb3f 100644 --- a/accept_sec_context.c +++ b/accept_sec_context.c @@ -82,6 +82,7 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) major = gssEapImportName(minor, &nameBuf, (ctx->gssFlags & GSS_C_ANON_FLAG) ? GSS_C_NT_ANONYMOUS : GSS_C_NT_USER_NAME, + ctx->mechanismUsed, &ctx->initiatorName); if (GSS_ERROR(major)) return major; @@ -126,16 +127,16 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred) static OM_uint32 eapGssSmAcceptAcceptorName(OM_uint32 *minor, - gss_cred_id_t cred, + gss_cred_id_t cred GSSEAP_UNUSED, 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_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) + OM_uint32 *smFlags GSSEAP_UNUSED) { OM_uint32 major; @@ -155,20 +156,21 @@ eapGssSmAcceptAcceptorName(OM_uint32 *minor, #ifdef GSSEAP_DEBUG static OM_uint32 eapGssSmAcceptVendorInfo(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_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, - OM_uint32 *smFlags) + 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 @@ -182,11 +184,11 @@ static OM_uint32 eapGssSmAcceptIdentity(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_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, OM_uint32 *smFlags) @@ -271,7 +273,7 @@ importInitiatorIdentity(OM_uint32 *minor, gssEapReleaseName(&tmpMinor, &ctx->initiatorName); return gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME, - &ctx->initiatorName); + ctx->mechanismUsed, &ctx->initiatorName); } /* @@ -419,7 +421,7 @@ createRadiusHandle(OM_uint32 *minor, assert(actx->radContext == NULL); assert(actx->radConn == NULL); - if (rs_context_create(&actx->radContext, RS_DICT_FILE) != 0) { + if (rs_context_create(&actx->radContext) != 0) { *minor = GSSEAP_RADSEC_CONTEXT_FAILURE; return GSS_S_FAILURE; } @@ -441,6 +443,11 @@ createRadiusHandle(OM_uint32 *minor, goto fail; } + if (rs_context_init_freeradius_dict(actx->radContext, NULL) != 0) { + err = rs_err_ctx_pop(actx->radContext); + goto fail; + } + if (rs_conn_create(actx->radContext, &actx->radConn, configStanza) != 0) { err = rs_err_conn_pop(actx->radConn); goto fail; @@ -467,11 +474,11 @@ static OM_uint32 eapGssSmAcceptAuthenticate(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_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, OM_uint32 *smFlags) @@ -575,9 +582,6 @@ 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; @@ -594,22 +598,30 @@ cleanup: 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 eapGssSmAcceptGssChannelBindings(OM_uint32 *minor, - gss_cred_id_t cred, + gss_cred_id_t cred GSSEAP_UNUSED, gss_ctx_id_t ctx, - gss_name_t target, - gss_OID mech, - OM_uint32 reqFlags, - OM_uint32 timeReq, + 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, - OM_uint32 *smFlags) + gss_buffer_t outputToken GSSEAP_UNUSED, + OM_uint32 *smFlags GSSEAP_UNUSED) { OM_uint32 major, tmpMinor; gss_iov_buffer_desc iov[2]; @@ -624,7 +636,7 @@ eapGssSmAcceptGssChannelBindings(OM_uint32 *minor, major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL, iov, 2, TOK_TYPE_WRAP); if (GSS_ERROR(major)) - return GSS_S_BAD_BINDINGS; + return major; if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS && !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) { @@ -645,14 +657,14 @@ static OM_uint32 eapGssSmAcceptReauthCreds(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_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) + OM_uint32 *smFlags GSSEAP_UNUSED) { OM_uint32 major; @@ -672,16 +684,16 @@ eapGssSmAcceptReauthCreds(OM_uint32 *minor, static OM_uint32 eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor, - gss_cred_id_t cred, + gss_cred_id_t cred GSSEAP_UNUSED, 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 *smFlags) + 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) { GSSEAP_SM_TRANSITION_NEXT(ctx); @@ -692,15 +704,15 @@ eapGssSmAcceptCompleteInitiatorExts(OM_uint32 *minor, static OM_uint32 eapGssSmAcceptCompleteAcceptorExts(OM_uint32 *minor, - gss_cred_id_t cred, + gss_cred_id_t cred GSSEAP_UNUSED, 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, + 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_SM_TRANSITION(ctx, GSSEAP_STATE_ESTABLISHED); @@ -864,8 +876,14 @@ gss_accept_sec_context(OM_uint32 *minor, goto cleanup; if (mech_type != NULL) { - if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) - duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type); + OM_uint32 tmpMajor; + + tmpMajor = gssEapCanonicalizeOid(&tmpMinor, ctx->mechanismUsed, 0, mech_type); + if (GSS_ERROR(tmpMajor)) { + major = tmpMajor; + *minor = tmpMinor; + goto cleanup; + } } if (ret_flags != NULL) *ret_flags = ctx->gssFlags; @@ -925,10 +943,10 @@ static OM_uint32 eapGssSmAcceptGssReauth(OM_uint32 *minor, gss_cred_id_t cred, gss_ctx_id_t ctx, - gss_name_t target, + gss_name_t target GSSEAP_UNUSED, gss_OID mech, - OM_uint32 reqFlags, - OM_uint32 timeReq, + OM_uint32 reqFlags GSSEAP_UNUSED, + OM_uint32 timeReq GSSEAP_UNUSED, gss_channel_bindings_t chanBindings, gss_buffer_t inputToken, gss_buffer_t outputToken,