* SUCH DAMAGE.
*/
+/*
+ * Establish a security context on the initiator (client). These functions
+ * wrap around libeap.
+ */
+
#include "gssapiP_eap.h"
#ifdef GSSEAP_ENABLE_REAUTH
peerNotifyPending,
};
+#ifdef GSSEAP_DEBUG
extern int wpa_debug_level;
+#endif
static OM_uint32
peerConfigInit(OM_uint32 *minor,
GSSEAP_KRB_INIT(&krbContext);
eapPeerConfig->fragment_size = 1024;
+#ifdef GSSEAP_DEBUG
wpa_debug_level = 0;
+#endif
assert(cred->name != GSS_C_NO_NAME);
if (!gssEapInternalizeOid(mech, &ctx->mechanismUsed))
major = duplicateOid(minor, mech, &ctx->mechanismUsed);
} else {
- *minor = GSSEAP_WRONG_MECH;
major = GSS_S_BAD_MECH;
+ *minor = GSSEAP_WRONG_MECH;
}
if (GSS_ERROR(major))
return major;
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_AUTHENTICATE;
+ ctx->state = GSSEAP_STATE_AUTHENTICATE;
*minor = 0;
return GSS_S_CONTINUE_NEEDED;
ctx,
&eapConfig);
if (ctx->initiatorCtx.eap == NULL) {
- *minor = GSSEAP_PEER_SM_INIT_FAILURE;
major = GSS_S_FAILURE;
+ *minor = GSSEAP_PEER_SM_INIT_FAILURE;
goto cleanup;
}
ctx->flags &= ~(CTX_FLAG_EAP_SUCCESS);
major = GSS_S_CONTINUE_NEEDED;
- ctx->state = EAP_STATE_EXTENSIONS_REQ;
+ ctx->state = GSSEAP_STATE_EXTENSIONS_REQ;
} else if (ctx->flags & CTX_FLAG_EAP_FAIL) {
- *minor = GSSEAP_PEER_AUTH_FAILURE;
major = GSS_S_DEFECTIVE_CREDENTIAL;
+ *minor = GSSEAP_PEER_AUTH_FAILURE;
} else if (code == 0 && initialContextToken) {
resp = &emptyWpaBuffer;
major = GSS_S_CONTINUE_NEEDED;
} else {
- *minor = GSSEAP_PEER_BAD_MESSAGE;
major = GSS_S_DEFECTIVE_TOKEN;
+ *minor = GSSEAP_PEER_BAD_MESSAGE;
}
cleanup:
assert(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;
major = load_uint32_be(&p[0]);
*minor = ERROR_TABLE_BASE_eapg + load_uint32_be(&p[4]);
- if (!GSS_ERROR(major)) {
- *minor = GSSEAP_BAD_ERROR_TOKEN;
+ if (!GSS_ERROR(major) || !IS_WIRE_ERROR(*minor)) {
major = GSS_S_FAILURE;
+ *minor = GSSEAP_BAD_ERROR_TOKEN;
}
return major;
#ifdef GSSEAP_ENABLE_REAUTH
if (initialContextToken && gssEapCanReauthP(cred, target_name, time_req))
- ctx->state = EAP_STATE_KRB_REAUTH_GSS;
+ ctx->state = GSSEAP_STATE_KRB_REAUTH;
#endif
if ((cred->flags & CRED_FLAG_INITIATE) == 0) {
- *minor = GSSEAP_CRED_USAGE_MISMATCH;
major = GSS_S_NO_CRED;
+ *minor = GSSEAP_CRED_USAGE_MISMATCH;
goto cleanup;
}
goto cleanup;
if (tokType == TOK_TYPE_CONTEXT_ERR) {
- ctx->state = EAP_STATE_ERROR;
+ ctx->state = GSSEAP_STATE_ERROR;
} else if (tokType != sm->inputTokenType) {
- *minor = GSSEAP_WRONG_TOK_ID;
major = GSS_S_DEFECTIVE_TOKEN;
+ *minor = GSSEAP_WRONG_TOK_ID;
goto cleanup;
}
} else {
if (time_rec != NULL)
gssEapContextTime(&tmpMinor, ctx, time_rec);
- assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
+ assert(ctx->state == GSSEAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
cleanup:
if (cred != GSS_C_NO_CREDENTIAL)
assert(cred != GSS_C_NO_CREDENTIAL);
- ctx->flags |= CTX_FLAG_KRB_REAUTH_GSS;
+ ctx->flags |= CTX_FLAG_KRB_REAUTH;
if (inputToken->length == 0) {
major = initBegin(minor, cred, ctx, target, mech,
major = gssEapReauthComplete(minor, ctx, cred, actualMech, timeRec);
if (GSS_ERROR(major))
goto cleanup;
- ctx->state = EAP_STATE_ESTABLISHED;
+ ctx->state = GSSEAP_STATE_ESTABLISHED;
}
cleanup: