static void
releaseInitiatorContext(struct gss_eap_initiator_ctx *ctx)
{
+ OM_uint32 minor;
+
+ gssEapReleaseCred(&minor, &ctx->defaultCred);
eap_peer_sm_deinit(ctx->eap);
}
{
OM_uint32 tmpMinor;
- if (ctx->avps != NULL)
- rc_avpair_free(ctx->avps);
+ if (ctx->radConn != NULL)
+ rs_conn_destroy(ctx->radConn);
if (ctx->radHandle != NULL)
- rc_config_free(ctx->radHandle);
-
+ rs_context_destroy(ctx->radHandle);
+ if (ctx->radServer != NULL)
+ GSSEAP_FREE(ctx->radServer);
gss_release_buffer(&tmpMinor, &ctx->state);
+ if (ctx->avps != NULL)
+ pairfree(&ctx->avps);
}
OM_uint32
gssEapKerberosInit(&tmpMinor, &krbContext);
+#ifdef GSSEAP_ENABLE_REAUTH
if (ctx->flags & CTX_FLAG_KRB_REAUTH_GSS) {
gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
- } else if (CTX_IS_INITIATOR(ctx)) {
+ } else
+#endif
+ if (CTX_IS_INITIATOR(ctx)) {
releaseInitiatorContext(&ctx->initiatorCtx);
} else {
releaseAcceptorContext(&ctx->acceptorCtx);
gssEapVerifyToken(OM_uint32 *minor,
gss_ctx_id_t ctx,
const gss_buffer_t inputToken,
- enum gss_eap_token_type tokenType,
enum gss_eap_token_type *actualToken,
gss_buffer_t innerInputToken)
{
}
major = verifyTokenHeader(minor, oid, &bodySize, &p,
- inputToken->length, tokenType,
- actualToken);
+ inputToken->length, actualToken);
if (GSS_ERROR(major))
- return GSS_S_DEFECTIVE_TOKEN;
+ return major;
if (ctx->mechanismUsed == GSS_C_NO_OID) {
if (!gssEapIsConcreteMechanismOid(oid))
gss_ctx_id_t context_handle,
OM_uint32 *time_rec)
{
- if (context_handle == GSS_C_NO_CONTEXT) {
- return GSS_S_NO_CONTEXT;
- }
-
- if (!CTX_IS_ESTABLISHED(context_handle)) {
- return GSS_S_NO_CONTEXT;
- }
-
- *minor = 0;
-
if (context_handle->expiryTime == 0) {
*time_rec = GSS_C_INDEFINITE;
} else {