if (GSS_ERROR(major))
return major;
- ctx->initiatorName->attrCtx = gssEapCreateAttrContext(cred, ctx);
+ major = gssEapCreateAttrContext(minor, cred, ctx,
+ &ctx->initiatorName->attrCtx);
+ if (GSS_ERROR(major))
+ return major;
*minor = 0;
return GSS_S_COMPLETE;
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_AUTHENTICATE;
+ ctx->state = GSSEAP_STATE_AUTHENTICATE;
*minor = 0;
return GSS_S_CONTINUE_NEEDED;
goto fail;
}
- /* XXX TODO rs_conn_select_server does not exist yet */
-#if 0
if (actx->radServer != NULL) {
if (rs_conn_select_server(actx->radConn, actx->radServer) != 0) {
err = rs_err_conn_pop(actx->radConn);
goto fail;
}
}
-#endif
*minor = 0;
return GSS_S_COMPLETE;
if (GSS_ERROR(major))
goto cleanup;
- ctx->state = EAP_STATE_EXTENSIONS_REQ;
+ ctx->state = GSSEAP_STATE_EXTENSIONS_REQ;
}
*minor = 0;
outputToken->length = 0;
outputToken->value = NULL;
- ctx->state = EAP_STATE_EXTENSIONS_RESP;
+ ctx->state = GSSEAP_STATE_EXTENSIONS_RESP;
*minor = 0;
return GSS_S_CONTINUE_NEEDED;
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_ESTABLISHED;
+ ctx->state = GSSEAP_STATE_ESTABLISHED;
*minor = 0;
return GSS_S_COMPLETE;
case GSSEAP_TOK_TRUNC:
case GSSEAP_BAD_DIRECTION:
case GSSEAP_WRONG_TOK_ID:
- case GSSEAP_REFLECT:
case GSSEAP_CRIT_EXT_UNAVAILABLE:
case GSSEAP_MISSING_REQUIRED_EXT:
case GSSEAP_KEY_UNAVAILABLE:
default:
if (IS_RADIUS_ERROR(minorStatus))
/* Squash RADIUS error codes */
- minorStatus = GSSEAP_GENERIC_RADIUS_ERROR;
+ minorStatus = GSSEAP_RADIUS_PROT_FAILURE;
else
/* Don't return system error codes */
return GSS_S_COMPLETE;
* machine and process Kerberos GSS messages instead.
*/
if (tokType == TOK_TYPE_GSS_REAUTH && initialContextToken) {
- ctx->state = EAP_STATE_KRB_REAUTH_GSS;
+ ctx->state = GSSEAP_STATE_KRB_REAUTH;
} else
#endif
if (tokType != sm->inputTokenType) {
goto cleanup;
}
- sm = &eapGssAcceptorSm[EAP_STATE_ERROR];
+ sm = &eapGssAcceptorSm[GSSEAP_STATE_ERROR];
goto send_token;
}
} while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0);
}
}
- assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
+ assert(ctx->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
send_token:
if (innerOutputToken.value != NULL) {
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_ESTABLISHED;
+ ctx->state = GSSEAP_STATE_ESTABLISHED;
*minor = 0;
return GSS_S_COMPLETE;
gss_OID mech = GSS_C_NO_OID;
OM_uint32 gssFlags, timeRec = GSS_C_INDEFINITE;
- ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS;
+ ctx->flags |= CTX_FLAG_KRB_REAUTH;
if (cred != GSS_C_NO_CREDENTIAL)
krbCred = cred->krbCred;