#include "gssapiP_eap.h"
+#ifdef GSSEAP_ENABLE_REAUTH
+static OM_uint32
+eapGssSmAcceptGssReauth(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ gss_buffer_t inputToken,
+ gss_channel_bindings_t chanBindings,
+ gss_buffer_t outputToken);
+#endif
+
/*
* Mark a context as ready for cryptographic operations
*/
pos[0] == EAP_TYPE_IDENTITY) {
/*
* XXX TODO do we really need to set User-Name? FreeRADIUS does
- * not appear to require it.
+ * not require it but some other RADIUS servers might.
*/
major = addAvpFromBuffer(minor, rh, &send, PW_USER_NAME, 0, &nameBuf);
if (GSS_ERROR(major))
if (GSS_ERROR(major))
goto cleanup;
- ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS;
+ ctx->state = EAP_STATE_EXTENSIONS_REQ;
}
major = GSS_S_CONTINUE_NEEDED;
}
static OM_uint32
-eapGssSmAcceptGssChannelBindings(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_cred_id_t cred,
- gss_buffer_t inputToken,
- gss_channel_bindings_t chanBindings,
- gss_buffer_t outputToken)
+acceptGssChannelBindings(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ gss_buffer_t inputToken,
+ gss_channel_bindings_t chanBindings)
{
- OM_uint32 major;
+ OM_uint32 major, tmpMinor;
gss_iov_buffer_desc iov[2];
- outputToken->length = 0;
- outputToken->value = NULL;
-
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) {
- if (inputToken->length < 14) {
- return GSS_S_DEFECTIVE_TOKEN;
- }
+ iov[0].type = GSS_IOV_BUFFER_TYPE_DATA | GSS_IOV_BUFFER_FLAG_ALLOCATE;
+ iov[0].buffer.length = 0;
+ iov[0].buffer.value = NULL;
- iov[0].type = GSS_IOV_BUFFER_TYPE_DATA;
- iov[0].buffer.length = 0;
- iov[0].buffer.value = NULL;
+ iov[1].type = GSS_IOV_BUFFER_TYPE_STREAM;
+ iov[1].buffer = *inputToken;
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
- iov[0].buffer = chanBindings->application_data;
-
- iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER;
- iov[1].buffer.length = 16;
- iov[1].buffer.value = (unsigned char *)inputToken->value - 2;
-
- assert(load_uint16_be(iov[1].buffer.value) == TOK_TYPE_GSS_CB);
-
- iov[2].type = GSS_IOV_BUFFER_TYPE_TRAILER;
- iov[2].buffer.length = inputToken->length - 14;
- iov[2].buffer.value = (unsigned char *)inputToken->value + 14;
+ major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL,
+ iov, 2, TOK_TYPE_WRAP);
+ if (GSS_ERROR(major))
+ return major;
- major = gssEapUnwrapOrVerifyMIC(minor, ctx, NULL, NULL,
- iov, 3, TOK_TYPE_GSS_CB);
- if (GSS_ERROR(major))
- return major;
+ if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS &&
+ !bufferEqual(&iov[0].buffer, &chanBindings->application_data)) {
+ major = GSS_S_BAD_BINDINGS;
+ } else {
+ major = GSS_S_CONTINUE_NEEDED;
}
- ctx->state = EAP_STATE_KRB_REAUTH_CRED;
+ gss_release_buffer(&tmpMinor, &iov[0].buffer);
- return GSS_S_CONTINUE_NEEDED;
+ return major;
}
static OM_uint32
-eapGssSmAcceptKrbReauthCred(OM_uint32 *minor,
+eapGssSmAcceptExtensionsReq(OM_uint32 *minor,
gss_ctx_id_t ctx,
gss_cred_id_t cred,
gss_buffer_t inputToken,
{
OM_uint32 major;
- major = gssEapMakeReauthCreds(minor, ctx, cred, outputToken);
+ outputToken->length = 0;
+ outputToken->value = NULL;
+
+ major = acceptGssChannelBindings(minor, ctx, cred, inputToken,
+ chanBindings);
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_ESTABLISHED;
+ ctx->state = EAP_STATE_EXTENSIONS_RESP;
- return GSS_S_COMPLETE;
-}
-
-static OM_uint32
-eapGssSmAcceptEstablished(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_cred_id_t cred,
- gss_buffer_t inputToken,
- gss_channel_bindings_t chanBindings,
- gss_buffer_t outputToken)
-{
- /* Called with already established context */
- *minor = EINVAL;
- return GSS_S_BAD_STATUS;
+ return GSS_S_CONTINUE_NEEDED;
}
static OM_uint32
-acceptReadyKrb(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_cred_id_t cred,
- const gss_name_t initiator,
- const gss_OID mech,
- OM_uint32 timeRec)
+eapGssSmAcceptExtensionsResp(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ gss_buffer_t inputToken,
+ gss_channel_bindings_t chanBindings,
+ gss_buffer_t outputToken)
{
OM_uint32 major, tmpMinor;
- gss_buffer_desc authData = GSS_C_EMPTY_BUFFER;
-
- major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName);
- if (GSS_ERROR(major))
- goto cleanup;
-
- major = gssKrbExtractAuthzDataFromSecContext(minor, ctx->kerberosCtx,
- KRB5_AUTHDATA_RADIUS_AVP,
- &authData);
- if (GSS_ERROR(major))
- goto cleanup;
-
- major = gssEapImportAttrContext(minor, &authData, ctx->initiatorName);
+ gss_buffer_desc credsToken = GSS_C_EMPTY_BUFFER;
+
+ /*
+ * If we're built with fast reauthentication enabled, then
+ * fabricate a ticket from the initiator to ourselves.
+ * Otherwise return an empty token.
+ */
+#ifdef GSSEAP_ENABLE_REAUTH
+ major = gssEapMakeReauthCreds(minor, ctx, cred, &credsToken);
if (GSS_ERROR(major))
- goto cleanup;
+ return major;
+#else
+ credsToken.value = "";
+#endif /* GSSEAP_ENABLE_REAUTH */
- if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) {
- major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName);
- if (GSS_ERROR(major))
- goto cleanup;
+ major = duplicateBuffer(minor, &credsToken, outputToken);
+ if (GSS_ERROR(major)) {
+ gss_release_buffer(&tmpMinor, &credsToken);
+ return major;
}
- major = gssEapReauthComplete(minor, ctx, cred, mech, timeRec);
- if (GSS_ERROR(major))
- goto cleanup;
+#ifdef GSSEAP_ENABLE_REAUTH
+ gss_release_buffer(&tmpMinor, &credsToken);
+#endif
ctx->state = EAP_STATE_ESTABLISHED;
-cleanup:
- gss_release_buffer(&tmpMinor, &authData);
-
- return major;
+ return GSS_S_COMPLETE;
}
static OM_uint32
-eapGssSmAcceptGssReauth(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_cred_id_t cred,
- gss_buffer_t inputToken,
- gss_channel_bindings_t chanBindings,
- gss_buffer_t outputToken)
+eapGssSmAcceptEstablished(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ gss_buffer_t inputToken,
+ gss_channel_bindings_t chanBindings,
+ 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_GSS;
-
- if (cred != GSS_C_NO_CREDENTIAL)
- krbCred = cred->krbCred;
-
- major = gssAcceptSecContext(minor,
- &ctx->kerberosCtx,
- krbCred,
- inputToken,
- chanBindings,
- &krbInitiator,
- &mech,
- outputToken,
- &gssFlags,
- &timeRec,
- NULL);
- if (major == GSS_S_COMPLETE) {
- major = acceptReadyKrb(minor, ctx, cred,
- krbInitiator, mech, timeRec);
- }
-
- ctx->gssFlags = gssFlags & ~(GSS_C_DCE_STYLE);
-
- gssReleaseName(&tmpMinor, &krbInitiator);
-
- return major;
+ /* Called with already established context */
+ *minor = EINVAL;
+ return GSS_S_BAD_STATUS;
}
static struct gss_eap_acceptor_sm {
} eapGssAcceptorSm[] = {
{ TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptIdentity },
{ TOK_TYPE_EAP_RESP, TOK_TYPE_EAP_REQ, eapGssSmAcceptAuthenticate },
- { TOK_TYPE_GSS_CB, TOK_TYPE_NONE, eapGssSmAcceptGssChannelBindings },
- { TOK_TYPE_NONE, TOK_TYPE_KRB_CRED, eapGssSmAcceptKrbReauthCred },
+ { TOK_TYPE_EXT_REQ, TOK_TYPE_NONE, eapGssSmAcceptExtensionsReq },
+ { TOK_TYPE_NONE, TOK_TYPE_EXT_RESP, eapGssSmAcceptExtensionsResp },
{ TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmAcceptEstablished },
+#ifdef GSSEAP_ENABLE_REAUTH
{ TOK_TYPE_GSS_REAUTH, TOK_TYPE_GSS_REAUTH, eapGssSmAcceptGssReauth },
+#endif
};
OM_uint32
if (GSS_ERROR(major))
goto cleanup;
+#ifdef GSSEAP_ENABLE_REAUTH
+ /*
+ * If we're built with fast reauthentication support, it's valid
+ * for an initiator to send a GSS reauthentication token as its
+ * initial context token, causing us to short-circuit the state
+ * machine and process Kerberos GSS messages instead.
+ */
if (tokType == TOK_TYPE_GSS_REAUTH && initialContextToken) {
ctx->state = EAP_STATE_KRB_REAUTH_GSS;
- } else if (tokType != sm->inputTokenType) {
+ } else
+#endif
+ if (tokType != sm->inputTokenType) {
major = GSS_S_DEFECTIVE_TOKEN;
goto cleanup;
}
return major;
}
+
+#ifdef GSSEAP_ENABLE_REAUTH
+static OM_uint32
+acceptReadyKrb(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ const gss_name_t initiator,
+ const gss_OID mech,
+ OM_uint32 timeRec)
+{
+ OM_uint32 major;
+
+ major = gssEapGlueToMechName(minor, initiator, &ctx->initiatorName);
+ if (GSS_ERROR(major))
+ return major;
+
+ if (cred != GSS_C_NO_CREDENTIAL && cred->name != GSS_C_NO_NAME) {
+ major = gssEapDuplicateName(minor, cred->name, &ctx->acceptorName);
+ if (GSS_ERROR(major))
+ return major;
+ }
+
+ major = gssEapReauthComplete(minor, ctx, cred, mech, timeRec);
+ if (GSS_ERROR(major))
+ return major;
+
+ ctx->state = EAP_STATE_ESTABLISHED;
+
+ return GSS_S_COMPLETE;
+}
+
+static OM_uint32
+eapGssSmAcceptGssReauth(OM_uint32 *minor,
+ gss_ctx_id_t ctx,
+ gss_cred_id_t cred,
+ gss_buffer_t inputToken,
+ gss_channel_bindings_t chanBindings,
+ 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_GSS;
+
+ if (cred != GSS_C_NO_CREDENTIAL)
+ krbCred = cred->krbCred;
+
+ major = gssAcceptSecContext(minor,
+ &ctx->kerberosCtx,
+ krbCred,
+ inputToken,
+ chanBindings,
+ &krbInitiator,
+ &mech,
+ outputToken,
+ &gssFlags,
+ &timeRec,
+ NULL);
+ if (major == GSS_S_COMPLETE) {
+ major = acceptReadyKrb(minor, ctx, cred,
+ krbInitiator, mech, timeRec);
+ }
+
+ ctx->gssFlags = gssFlags;
+
+ gssReleaseName(&tmpMinor, &krbInitiator);
+
+ return major;
+}
+#endif /* GSSEAP_ENABLE_REAUTH */
projects / mech_eap.orig / blobdiff