#endif
/*
- * Mark a context as ready for cryptographic operations
+ * Mark an acceptor context as ready for cryptographic operations
*/
static OM_uint32
acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
return GSS_S_COMPLETE;
}
+/*
+ * Emit a identity EAP request to force the initiator (peer) to identify
+ * itself.
+ */
static OM_uint32
eapGssSmAcceptIdentity(OM_uint32 *minor,
gss_ctx_id_t ctx,
return GSS_S_CONTINUE_NEEDED;
}
+/*
+ * Pass the asserted acceptor identity to the authentication server.
+ */
static OM_uint32
setAcceptorIdentity(OM_uint32 *minor,
gss_ctx_id_t ctx,
return GSS_S_COMPLETE;
}
+/*
+ * Allocate a RadSec handle
+ */
static OM_uint32
createRadiusHandle(OM_uint32 *minor,
gss_cred_id_t cred,
return gssEapRadiusMapError(minor, err);
}
+/*
+ * Process a EAP response from the initiator.
+ */
static OM_uint32
eapGssSmAcceptAuthenticate(OM_uint32 *minor,
gss_ctx_id_t ctx,
major = GSS_S_CONTINUE_NEEDED;
break;
case PW_AUTHENTICATION_REJECT:
- *minor = GSSEAP_PEER_AUTH_FAILURE;
+ *minor = GSSEAP_RADIUS_AUTH_FAILURE;
major = GSS_S_DEFECTIVE_CREDENTIAL;
goto cleanup;
break;
default:
+ *minor = GSSEAP_UNKNOWN_RADIUS_CODE;
major = GSS_S_FAILURE;
goto cleanup;
break;
major = gssEapRadiusGetAvp(minor, frresp->vps, PW_EAP_MESSAGE, 0,
outputToken, TRUE);
- if ((major == GSS_S_UNAVAILABLE && frresp->code != PW_AUTHENTICATION_ACK) ||
- GSS_ERROR(major))
+ if (major == GSS_S_UNAVAILABLE && frresp->code == PW_ACCESS_CHALLENGE) {
+ *minor = GSSEAP_MISSING_EAP_REQUEST;
+ major = GSS_S_DEFECTIVE_TOKEN;
+ goto cleanup;
+ } else if (GSS_ERROR(major))
goto cleanup;
if (frresp->code == PW_ACCESS_CHALLENGE) {
major = gssEapRadiusGetAvp(minor, frresp->vps, PW_STATE, 0,
&ctx->acceptorCtx.state, TRUE);
- if (major != GSS_S_UNAVAILABLE && GSS_ERROR(major))
+ if (GSS_ERROR(major) && *minor != GSSEAP_NO_SUCH_ATTR)
goto cleanup;
} else {
ctx->acceptorCtx.vps = frresp->vps;
return GSS_S_BAD_STATUS;
}
+static OM_uint32
+makeErrorToken(OM_uint32 *minor,
+ OM_uint32 majorStatus,
+ OM_uint32 minorStatus,
+ gss_buffer_t outputToken)
+{
+ unsigned char errorData[8];
+ gss_buffer_desc errorBuffer;
+
+ assert(GSS_ERROR(majorStatus));
+
+ /*
+ * Only return error codes that the initiator could have caused,
+ * to avoid information leakage.
+ */
+ switch (minorStatus) {
+ case GSSEAP_WRONG_SIZE:
+ case GSSEAP_WRONG_MECH:
+ case GSSEAP_BAD_TOK_HEADER:
+ case GSSEAP_BAD_DIRECTION:
+ case GSSEAP_WRONG_TOK_ID:
+ case GSSEAP_CRIT_EXT_UNAVAILABLE:
+ case GSSEAP_MISSING_REQUIRED_EXT:
+ case GSSEAP_KEY_UNAVAILABLE:
+ case GSSEAP_KEY_TOO_SHORT:
+ case GSSEAP_RADIUS_AUTH_FAILURE:
+ case GSSEAP_UNKNOWN_RADIUS_CODE:
+ case GSSEAP_MISSING_EAP_REQUEST:
+ break;
+ default:
+ if (IS_RADIUS_ERROR(minorStatus))
+ /* Squash RADIUS error codes */
+ minorStatus = GSSEAP_GENERIC_RADIUS_ERROR;
+ else
+ /* Don't return system error codes */
+ return GSS_S_COMPLETE;
+ }
+
+ minorStatus -= ERROR_TABLE_BASE_eapg;
+
+ store_uint32_be(majorStatus, &errorData[0]);
+ store_uint32_be(minorStatus, &errorData[4]);
+
+ errorBuffer.length = sizeof(errorData);
+ errorBuffer.value = errorData;
+
+ return duplicateBuffer(minor, &errorBuffer, outputToken);
+}
+
static struct gss_eap_acceptor_sm {
enum gss_eap_token_type inputTokenType;
enum gss_eap_token_type outputTokenType;
gss_channel_bindings_t,
gss_buffer_t);
} eapGssAcceptorSm[] = {
- { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity },
- { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate },
- { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq },
- { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp },
- { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished },
+ { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity },
+ { TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate },
+ { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq },
+ { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp },
+ { TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished },
+ { TOK_TYPE_NONE, TOK_TYPE_CONTEXT_ERR, NULL },
#ifdef GSSEAP_ENABLE_REAUTH
- { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth },
+ { TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth },
#endif
};
&innerInputToken,
input_chan_bindings,
&innerOutputToken);
- if (GSS_ERROR(major))
- goto cleanup;
+ if (GSS_ERROR(major)) {
+ /* Possibly generate an error token */
+ tmpMajor = makeErrorToken(&tmpMinor, major, *minor, &innerOutputToken);
+ if (GSS_ERROR(tmpMajor)) {
+ major = tmpMajor;
+ goto cleanup;
+ }
+
+ sm = &eapGssAcceptorSm[EAP_STATE_ERROR];
+ goto send_token;
+ }
} while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0);
if (mech_type != NULL) {
if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type))
duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type);
}
- if (innerOutputToken.value != NULL) {
- tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken,
- sm->outputTokenType, output_token);
- if (GSS_ERROR(tmpMajor)) {
- major = tmpMajor;
- *minor = tmpMinor;
- goto cleanup;
- }
- }
if (ret_flags != NULL)
*ret_flags = ctx->gssFlags;
if (delegated_cred_handle != NULL)
assert(ctx->state == EAP_STATE_ESTABLISHED || major == GSS_S_CONTINUE_NEEDED);
+send_token:
+ if (innerOutputToken.value != NULL) {
+ tmpMajor = gssEapMakeToken(&tmpMinor, ctx, &innerOutputToken,
+ sm->outputTokenType, output_token);
+ if (GSS_ERROR(tmpMajor)) {
+ major = tmpMajor;
+ *minor = tmpMinor;
+ goto cleanup;
+ }
+ }
+
cleanup:
if (cred != GSS_C_NO_CREDENTIAL)
GSSEAP_MUTEX_UNLOCK(&cred->mutex);
projects / mech_eap.orig / blobdiff