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;
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;
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;
}
+
+ cred = ctx->defaultCred;
}
+ GSSEAP_MUTEX_LOCK(&cred->mutex);
+
sm = &eapGssAcceptorSm[ctx->state];
major = gssEapVerifyToken(minor, ctx, input_token,
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;
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;
- if (cred != GSS_C_NO_CREDENTIAL)
- krbCred = cred->krbCred;
-
major = gssAcceptSecContext(minor,
&ctx->kerberosCtx,
- krbCred,
+ cred->krbCred,
inputToken,
chanBindings,
&krbInitiator,
#define CTX_FLAG_EAP_MASK 0xFFFF0000
struct gss_eap_initiator_ctx {
- gss_cred_id_t defaultCred;
unsigned int idleWhile;
#ifndef __cplusplus
struct eap_peer_config eapPeerConfig;
time_t expiryTime;
uint64_t sendSeq, recvSeq;
void *seqState;
+ gss_cred_id_t defaultCred;
union {
struct gss_eap_initiator_ctx initiator;
#define initiatorCtx ctxU.initiator
gss_buffer_desc innerInputToken;
gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER;
enum gss_eap_token_type tokType;
- gss_cred_id_t defaultCred = GSS_C_NO_CREDENTIAL;
int initialContextToken = 0;
*minor = 0;
GSSEAP_MUTEX_LOCK(&ctx->mutex);
if (cred == GSS_C_NO_CREDENTIAL) {
- if (ctx->initiatorCtx.defaultCred == GSS_C_NO_CREDENTIAL) {
+ if (ctx->defaultCred == GSS_C_NO_CREDENTIAL) {
major = gssEapAcquireCred(minor,
GSS_C_NO_NAME,
GSS_C_NO_BUFFER,
time_req,
GSS_C_NO_OID_SET,
GSS_C_INITIATE,
- &defaultCred,
+ &ctx->defaultCred,
NULL,
NULL);
if (GSS_ERROR(major))
goto cleanup;
}
- cred = ctx->initiatorCtx.defaultCred;
+ cred = ctx->defaultCred;
}
GSSEAP_MUTEX_LOCK(&cred->mutex);
static void
releaseInitiatorContext(struct gss_eap_initiator_ctx *ctx)
{
- OM_uint32 minor;
-
- gssEapReleaseCred(&minor, &ctx->defaultCred);
eap_peer_sm_deinit(ctx->eap);
}
gssEapReleaseName(&tmpMinor, &ctx->acceptorName);
gss_release_oid(&tmpMinor, &ctx->mechanismUsed);
sequenceFree(&tmpMinor, &ctx->seqState);
+ gssEapReleaseCred(&tmpMinor, &ctx->defaultCred);
GSSEAP_MUTEX_DESTROY(&ctx->mutex);