return major;
major = gssAcceptSecContext(minor,
- &ctx->kerberosCtx,
+ &ctx->reauthCtx,
cred->krbCred,
inputToken,
&wireChanBindings,
} else if (GSS_ERROR(major) &&
(*smFlags & SM_FLAG_INPUT_TOKEN_CRITICAL) == 0) {
/* Fall back to EAP */
- gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+ gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);
ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
} else {
struct gss_eap_acceptor_ctx acceptor;
#define acceptorCtx ctxU.acceptor
#ifdef GSSEAP_ENABLE_REAUTH
- gss_ctx_id_t kerberos;
- #define kerberosCtx ctxU.kerberos
+ gss_ctx_id_t reauth;
+ #define reauthCtx ctxU.reauth
#endif
} ctxU;
gss_buffer_desc conversation;
major = gssInitSecContext(minor,
cred->krbCred,
- &ctx->kerberosCtx,
+ &ctx->reauthCtx,
mechTarget,
(gss_OID)gss_mech_krb5,
reqFlags | GSS_C_MUTUAL_FLAG,
OM_uint32 tmpMinor;
/* server didn't support reauthentication, sent EAP request */
- gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+ gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);
ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
} else
#ifdef GSSEAP_ENABLE_REAUTH
if (ctx->flags & CTX_FLAG_KRB_REAUTH) {
- gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+ gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);
} else
#endif
if (CTX_IS_INITIATOR(ctx)) {
major = defrostAttrContext(minor,
#ifdef HAVE_HEIMDAL_VERSION
- ctx->kerberosCtx,
+ ctx->reauthCtx,
#else
glueName,
#endif
/* Get the raw subsession key and encryption type */
#ifdef HAVE_HEIMDAL_VERSION
#define KRB_GSS_SUBKEY_COUNT 1 /* encoded session key */
- major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+ major = gssInquireSecContextByOid(minor, ctx->reauthCtx,
GSS_KRB5_GET_SUBKEY_X, &keyData);
#else
#define KRB_GSS_SUBKEY_COUNT 2 /* raw session key, enctype OID */
- major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+ major = gssInquireSecContextByOid(minor, ctx->reauthCtx,
GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
#endif
if (GSS_ERROR(major))