}
return flag;
-
}
static struct eap_peer_config *
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);
}
- sequenceInit(&ctx->seqState, ctx->recvSeq,
- ((ctx->gssFlags & GSS_C_REPLAY_FLAG) != 0),
- ((ctx->gssFlags & GSS_C_SEQUENCE_FLAG) != 0),
- TRUE);
+ 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;
}
OM_uint32 tmpMajor, tmpMinor;
time_t now;
int initialContextToken = 0, code;
- gss_buffer_desc respBuf;
-
- respBuf.length = 0;
- respBuf.value = NULL;
+ gss_buffer_desc respBuf = GSS_C_EMPTY_BUFFER;
initialContextToken = (inputToken == GSS_C_NO_BUFFER ||
inputToken->length == 0);
ctx->flags &= ~(CTX_FLAG_EAP_SUCCESS);
major = GSS_S_CONTINUE_NEEDED;
ctx->state = EAP_STATE_GSS_CHANNEL_BINDINGS;
- } else if ((ctx->flags & CTX_FLAG_EAP_FAIL) || code == 0) {
+ } else if (ctx->flags & CTX_FLAG_EAP_FAIL) {
+ major = GSS_S_DEFECTIVE_CREDENTIAL;
+ } else if (code == 0) {
major = GSS_S_FAILURE;
}
iov[1].buffer.length = 0;
iov[1].buffer.value = NULL;
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) {
- major = gssEapEncodeGssChannelBindings(minor, chanBindings,
- &iov[0].buffer);
- if (GSS_ERROR(major))
- goto cleanup;
-
- iov[0].type |= GSS_IOV_BUFFER_FLAG_ALLOCATED;
- } else {
- iov[0].buffer.length = sizeof("NO_CHANNEL_BINDINGS") - 1;
- iov[0].buffer.value = "NO_CHANNEL_BINDINGS";
- }
+ 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);
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 *,
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;