OM_uint32 major;
const unsigned char *key;
size_t keyLength;
- krb5_enctype encryptionType;
- int gotKey = 0;
#if 1
/* XXX actually check for mutual auth */
#endif
/* Cache encryption type derived from selected mechanism OID */
- major = gssEapOidToEnctype(minor, ctx->mechanismUsed, &encryptionType);
+ major = gssEapOidToEnctype(minor, ctx->mechanismUsed, &ctx->encryptionType);
if (GSS_ERROR(major))
return major;
- if (encryptionType != ENCTYPE_NULL &&
- eap_key_available(ctx->initiatorCtx.eap)) {
- key = eap_get_eapKeyData(ctx->initiatorCtx.eap, &keyLength);
-
- if (keyLength >= EAP_EMSK_LEN) {
- major = gssEapDeriveRfc3961Key(minor,
- &key[EAP_EMSK_LEN / 2],
- EAP_EMSK_LEN / 2,
- encryptionType,
- &ctx->rfc3961Key);
- if (GSS_ERROR(major))
- return major;
-
- major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key,
- &ctx->checksumType);
- if (GSS_ERROR(major))
- return major;
- gotKey++;
- }
+ if (!eap_key_available(ctx->initiatorCtx.eap)) {
+ *minor = GSSEAP_KEY_UNAVAILABLE;
+ return GSS_S_UNAVAILABLE;
}
- if (gotKey) {
- ctx->encryptionType = encryptionType;
- } else {
- /*
- * draft-howlett-eap-gss says that integrity/confidentialty should
- * always be advertised as available, but if we have no keying
- * material it seems confusing to the caller to advertise this.
- */
- ctx->gssFlags &= ~(GSS_C_INTEG_FLAG | GSS_C_CONF_FLAG);
+ key = eap_get_eapKeyData(ctx->initiatorCtx.eap, &keyLength);
+
+ if (keyLength < EAP_EMSK_LEN) {
+ *minor = GSSEAP_KEY_TOO_SHORT;
+ return GSS_S_UNAVAILABLE;
}
+ major = gssEapDeriveRfc3961Key(minor,
+ &key[EAP_EMSK_LEN / 2],
+ EAP_EMSK_LEN / 2,
+ ctx->encryptionType,
+ &ctx->rfc3961Key);
+ if (GSS_ERROR(major))
+ return major;
+
+ major = rfc3961ChecksumTypeForKey(minor, &ctx->rfc3961Key,
+ &ctx->checksumType);
+ if (GSS_ERROR(major))
+ return major;
+
major = sequenceInit(minor,
&ctx->seqState,
ctx->recvSeq,
if (GSS_ERROR(major))
return major;
+ *minor = 0;
return GSS_S_COMPLETE;
}
else
ctx->expiryTime = time(NULL) + timeReq;
+ /*
+ * The credential mutex protects its name, however we need to
+ * explicitly lock the acceptor name (unlikely as it may be
+ * that it has attributes set on it).
+ */
major = gssEapDuplicateName(minor, cred->name, &ctx->initiatorName);
if (GSS_ERROR(major))
return major;
+ GSSEAP_MUTEX_LOCK(&target->mutex);
+
major = gssEapDuplicateName(minor, target, &ctx->acceptorName);
- if (GSS_ERROR(major))
+ if (GSS_ERROR(major)) {
+ GSSEAP_MUTEX_UNLOCK(&target->mutex);
return major;
+ }
+
+ GSSEAP_MUTEX_UNLOCK(&target->mutex);
if (mech == GSS_C_NULL_OID) {
major = gssEapDefaultMech(minor, &ctx->mechanismUsed);
if (!gssEapInternalizeOid(mech, &ctx->mechanismUsed))
major = duplicateOid(minor, mech, &ctx->mechanismUsed);
} else {
+ *minor = GSSEAP_WRONG_MECH;
major = GSS_S_BAD_MECH;
}
if (GSS_ERROR(major))
int initialContextToken;
initialContextToken = (inputToken->length == 0);
- if (!initialContextToken)
+ if (!initialContextToken) {
+ *minor = GSSEAP_WRONG_SIZE;
return GSS_S_DEFECTIVE_TOKEN;
+ }
major = initBegin(minor, cred, ctx, target, mech,
reqFlags, timeReq, chanBindings,
ctx,
&eapConfig);
if (ctx->initiatorCtx.eap == NULL) {
+ *minor = GSSEAP_PEER_INIT_FAILURE;
major = GSS_S_FAILURE;
goto cleanup;
}
major = GSS_S_CONTINUE_NEEDED;
ctx->state = EAP_STATE_EXTENSIONS_REQ;
} else if (ctx->flags & CTX_FLAG_EAP_FAIL) {
+ *minor = GSSEAP_PEER_AUTH_FAILURE;
major = GSS_S_DEFECTIVE_CREDENTIAL;
} else if (code == 0 && initialContextToken) {
resp = &emptyWpaBuffer;
major = GSS_S_CONTINUE_NEEDED;
} else {
+ *minor = GSSEAP_PEER_BAD_MESSAGE;
major = GSS_S_DEFECTIVE_TOKEN;
}
}
static OM_uint32
-initGssChannelBindings(OM_uint32 *minor,
- gss_ctx_id_t ctx,
- gss_channel_bindings_t chanBindings,
- gss_buffer_t outputToken)
-{
- OM_uint32 major;
- gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER;
-
-
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
- buffer = chanBindings->application_data;
-
- major = gssEapWrap(minor, ctx, TRUE, GSS_C_QOP_DEFAULT,
- &buffer, NULL, outputToken);
- if (GSS_ERROR(major))
- return major;
-
- return GSS_S_CONTINUE_NEEDED;
-}
-
-static OM_uint32
eapGssSmInitExtensionsReq(OM_uint32 *minor,
gss_cred_id_t cred,
gss_ctx_id_t ctx,
gss_buffer_t inputToken,
gss_buffer_t outputToken)
{
- OM_uint32 major, tmpMinor;
- gss_buffer_desc cbToken = GSS_C_EMPTY_BUFFER;
+ OM_uint32 major;
- major = initGssChannelBindings(minor, ctx, chanBindings, &cbToken);
+ major = gssEapMakeExtensions(minor, cred, ctx, chanBindings, outputToken);
if (GSS_ERROR(major))
return major;
- ctx->state = EAP_STATE_EXTENSIONS_RESP;
+ assert(outputToken->value != NULL);
- major = duplicateBuffer(minor, &cbToken, outputToken);
- if (GSS_ERROR(major)) {
- gss_release_buffer(&tmpMinor, &cbToken);
- return major;
- }
-
- gss_release_buffer(&tmpMinor, &cbToken);
+ ctx->state = EAP_STATE_EXTENSIONS_RESP;
return GSS_S_CONTINUE_NEEDED;
}
gss_buffer_t inputToken,
gss_buffer_t outputToken)
{
-#ifdef GSSEAP_ENABLE_REAUTH
OM_uint32 major;
- major = gssEapStoreReauthCreds(minor, ctx, cred, inputToken);
+ major = gssEapVerifyExtensions(minor, cred, ctx, chanBindings, inputToken);
if (GSS_ERROR(major))
return major;
-#endif
ctx->state = EAP_STATE_ESTABLISHED;
gss_buffer_t outputToken)
{
/* Called with already established context */
- *minor = EINVAL;
+ *minor = GSSEAP_CONTEXT_ESTABLISHED;
return GSS_S_BAD_STATUS;
}
if (ctx == GSS_C_NO_CONTEXT) {
if (input_token != GSS_C_NO_BUFFER && input_token->length != 0) {
+ *minor = GSSEAP_WRONG_SIZE;
return GSS_S_DEFECTIVE_TOKEN;
}
#ifdef GSSEAP_ENABLE_REAUTH
if (initialContextToken && gssEapCanReauthP(cred, target_name, time_req))
- ctx->state = EAP_STATE_KRB_REAUTH_GSS;
+ ctx->state = EAP_STATE_KRB_REAUTH_GSS;
#endif
if ((cred->flags & CRED_FLAG_INITIATE) == 0) {
+ *minor = GSSEAP_CRED_USAGE_MISMATCH;
major = GSS_S_NO_CRED;
goto cleanup;
}
goto cleanup;
if (tokType != sm->inputTokenType) {
+ *minor = GSSEAP_WRONG_TOK_ID;
major = GSS_S_DEFECTIVE_TOKEN;
goto cleanup;
}
projects / mech_eap.git / blobdiff