peerNotifyPending,
};
+extern int wpa_debug_level;
+
static OM_uint32
peerConfigInit(OM_uint32 *minor,
gss_cred_id_t cred,
GSSEAP_KRB_INIT(&krbContext);
if (loadConfig) {
+ eapPeerConfig->fragment_size = 1024;
+ wpa_debug_level = 0;
}
code = krb5_unparse_name(krbContext, cred->name->krbPrincipal, &identity);
}
static OM_uint32
-peerDeriveKey(OM_uint32 *minor,
- gss_ctx_id_t ctx)
+initReady(OM_uint32 *minor, gss_ctx_id_t ctx)
{
OM_uint32 major;
const unsigned char *key;
size_t keyLength;
- krb5_context krbContext;
-
- GSSEAP_KRB_INIT(&krbContext);
/* Cache encryption type derived from selected mechanism OID */
major = gssEapOidToEnctype(minor, ctx->mechanismUsed, &ctx->encryptionType);
eap_key_available(ctx->initiatorCtx.eap)) {
key = eap_get_eapKeyData(ctx->initiatorCtx.eap, &keyLength);
- major = gssEapDeriveRFC3961Key(minor, key, keyLength,
+ major = gssEapDeriveRfc3961Key(minor, key, keyLength,
ctx->encryptionType, &ctx->rfc3961Key);
if (GSS_ERROR(major))
return major;
+
+ major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key,
+ &ctx->checksumType);
+ if (GSS_ERROR(major))
+ return major;
} else {
/*
* draft-howlett-eap-gss says that integrity/confidentialty should
ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG);
}
+ major = sequenceInit(minor,
+ &ctx->seqState,
+ ctx->recvSeq,
+ ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0),
+ ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0),
+ TRUE);
+ if (GSS_ERROR(major))
+ return major;
+
return GSS_S_COMPLETE;
}
gss_buffer_t inputToken,
gss_buffer_t outputToken)
{
- OM_uint32 major, tmpMinor;
+ OM_uint32 major;
+ OM_uint32 tmpMajor, tmpMinor;
time_t now;
int initialContextToken = 0, code;
+ gss_buffer_desc respBuf = GSS_C_EMPTY_BUFFER;
initialContextToken = (inputToken == GSS_C_NO_BUFFER ||
inputToken->length == 0);
goto cleanup;
if (initialContextToken) {
+ struct eap_config eapConfig;
+
+ memset(&eapConfig, 0, sizeof(eapConfig));
ctx->flags |= CTX_FLAG_EAP_PORT_ENABLED;
ctx->initiatorCtx.eap = eap_peer_sm_init(ctx,
&gssEapPolicyCallbacks,
ctx,
- &ctx->initiatorCtx.eapConfig);
+ &eapConfig);
time(&now);
if (timeReq == 0 || timeReq == GSS_C_INDEFINITE)
}
if (GSS_ERROR(major))
goto cleanup;
+
+ /* If credentials were provided, check they're usable with this mech */
+ if (!gssEapCredAvailable(cred, ctx->mechanismUsed)) {
+ major = GSS_S_BAD_MECH;
+ goto cleanup;
+ }
+
+ respBuf.value = ""; /* emit empty inner token */
+ major = GSS_S_CONTINUE_NEEDED;
+ goto cleanup;
+ } else {
+ ctx->flags |= CTX_FLAG_EAP_REQ; /* we have a Request from the acceptor */
}
wpabuf_set(&ctx->initiatorCtx.reqData,
inputToken->value, inputToken->length);
- code = eap_peer_sm_step(ctx->initiatorCtx.eap);
+ major = GSS_S_CONTINUE_NEEDED;
+ code = eap_peer_sm_step(ctx->initiatorCtx.eap);
if (ctx->flags & CTX_FLAG_EAP_RESP) {
struct wpabuf *resp;
- gss_buffer_desc buf;
ctx->flags &= ~(CTX_FLAG_EAP_RESP);
resp = eap_get_eapRespData(ctx->initiatorCtx.eap);
-
if (resp != NULL) {
- buf.length = wpabuf_len(resp);
- buf.value = (void *)wpabuf_head(resp);
-
- major = duplicateBuffer(minor, &buf, outputToken);
- if (GSS_ERROR(major))
- goto cleanup;
-
- major = GSS_S_CONTINUE_NEEDED;
+ respBuf.length = wpabuf_len(resp);
+ respBuf.value = (void *)wpabuf_head(resp);
}
- }
-
- if (ctx->flags & CTX_FLAG_EAP_SUCCESS) {
- major = peerDeriveKey(minor, ctx);
+ } else if (ctx->flags & CTX_FLAG_EAP_SUCCESS) {
+ major = initReady(minor, ctx);
if (GSS_ERROR(major))
goto cleanup;
ctx->flags &= ~(CTX_FLAG_EAP_SUCCESS);
- ctx->state = EAP_STATE_ESTABLISHED;
- major = GSS_S_COMPLETE;
- } else if ((ctx->flags & CTX_FLAG_EAP_FAIL) || code == 0) {
+ major = GSS_S_CONTINUE_NEEDED;
+ ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS;
+ } else if (ctx->flags & CTX_FLAG_EAP_FAIL) {
+ major = GSS_S_DEFECTIVE_CREDENTIAL;
+ } else if (code == 0) {
major = GSS_S_FAILURE;
}
cleanup:
+ if (respBuf.value != NULL) {
+ OM_uint32 tmpMajor;
+
+ assert(major == GSS_S_CONTINUE_NEEDED);
+
+ tmpMajor = duplicateBuffer(&tmpMinor, &respBuf, outputToken);
+ if (GSS_ERROR(tmpMajor)) {
+ major = tmpMajor;
+ *minor = tmpMinor;
+ }
+ }
+
wpabuf_set(&ctx->initiatorCtx.reqData, NULL, 0);
peerConfigFree(&tmpMinor, ctx);
return major;
}
+#if 0
static OM_uint32
eapGssSmInitKeyTransport(OM_uint32 *minor,
gss_cred_id_t cred,
{
GSSEAP_NOT_IMPLEMENTED;
}
+#endif
static OM_uint32
eapGssSmInitGssChannelBindings(OM_uint32 *minor,
gss_buffer_t inputToken,
gss_buffer_t outputToken)
{
- GSSEAP_NOT_IMPLEMENTED;
+ OM_uint32 major, tmpMinor;
+ gss_iov_buffer_desc iov[2];
+ gss_buffer_desc buf;
+
+ 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_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE;
+ iov[1].buffer.length = 0;
+ iov[1].buffer.value = NULL;
+
+ if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
+ iov[0].buffer = chanBindings->application_data;
+
+ major = gssEapWrapOrGetMIC(minor, ctx, FALSE, FALSE, iov, 2,
+ TOK_TYPE_GSS_CB);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ /* Skip past token ID */
+ assert(iov[1].buffer.length > 2);
+ assert(load_uint16_be(iov[1].buffer.value) == TOK_TYPE_GSS_CB);
+
+ buf.length = iov[1].buffer.length - 2;
+ buf.value = (unsigned char *)iov[1].buffer.value + 2;
+
+ major = duplicateBuffer(minor, &buf, outputToken);
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ major = GSS_S_COMPLETE;
+ ctx->state = EAP_STATE_ESTABLISHED;
+
+cleanup:
+ gssEapReleaseIov(iov, 2);
+
+ return major;
}
static OM_uint32
return GSS_S_BAD_STATUS;
}
-static struct eap_gss_initiator_sm {
+static struct gss_eap_initiator_sm {
enum gss_eap_token_type inputTokenType;
enum gss_eap_token_type outputTokenType;
OM_uint32 (*processToken)(OM_uint32 *,
gss_buffer_t);
} eapGssInitiatorSm[] = {
{ TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitAuthenticate },
+#if 0
{ TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitKeyTransport },
{ TOK_TYPE_EAP_REQ, TOK_TYPE_EAP_RESP, eapGssSmInitSecureAssoc },
- { TOK_TYPE_GSS_CB, TOK_TYPE_NONE, eapGssSmInitGssChannelBindings },
+#endif
+ { TOK_TYPE_NONE, TOK_TYPE_GSS_CB, eapGssSmInitGssChannelBindings },
{ TOK_TYPE_NONE, TOK_TYPE_NONE, eapGssSmInitEstablished },
};
OM_uint32 *ret_flags,
OM_uint32 *time_rec)
{
- OM_uint32 major, tmpMinor;
+ OM_uint32 major;
+ OM_uint32 tmpMajor, tmpMinor;
gss_ctx_id_t ctx = *context_handle;
- struct eap_gss_initiator_sm *sm = NULL;
- gss_buffer_desc innerInputToken, innerOutputToken;
+ struct gss_eap_initiator_sm *sm = NULL;
+ gss_buffer_desc innerInputToken;
+ gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER;
*minor = 0;
- innerOutputToken.length = 0;
- innerOutputToken.value = NULL;
-
output_token->length = 0;
output_token->value = NULL;
* the status is not GSS_S_COMPLETE or an error status.
*/
do {
+ sm = &eapGssInitiatorSm[ctx->state];
+
major = (sm->processToken)(minor,
cred,
ctx,
&innerOutputToken);
if (GSS_ERROR(major))
goto cleanup;
- } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.length == 0);
+ } while (major == GSS_S_CONTINUE_NEEDED && innerOutputToken.value == NULL);
if (actual_mech_type != NULL) {
if (!gssEapInternalizeOid(ctx->mechanismUsed, actual_mech_type))
duplicateOid(&tmpMinor, ctx->mechanismUsed, actual_mech_type);
}
- if (innerOutputToken.length != 0) {
- major = gssEapMakeToken(minor, ctx, &innerOutputToken,
- sm->outputTokenType, output_token);
- if (GSS_ERROR(major))
+ 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;
projects / mech_eap.orig / blobdiff