#include "util_radius.h"
#include "utils/radius_utils.h"
+/* methods allowed for phase1 authentication*/
+static const struct eap_method_type allowed_eap_method_types[] = {
+ {EAP_VENDOR_IETF, EAP_TYPE_TTLS},
+ {EAP_VENDOR_IETF, EAP_TYPE_NONE}};
+
static OM_uint32
policyVariableToFlag(enum eapol_bool_var variable)
{
}
static const struct wpa_config_blob *
-peerGetConfigBlob(void *ctx GSSEAP_UNUSED,
- const char *name GSSEAP_UNUSED)
+peerGetConfigBlob(void *ctx,
+ const char *name)
{
- return NULL;
+ gss_ctx_id_t gssCtx = (gss_ctx_id_t)ctx;
+ size_t index;
+
+ if (strcmp(name, "client-cert") == 0)
+ index = CONFIG_BLOB_CLIENT_CERT;
+ else if (strcmp(name, "private-key") == 0)
+ index = CONFIG_BLOB_PRIVATE_KEY;
+ else if (strcmp(name, "ca-cert") == 0)
+ index = CONFIG_BLOB_CA_CERT;
+ else
+ return NULL;
+
+ return &gssCtx->initiatorCtx.configBlobs[index];
}
static void
extern int wpa_debug_level;
#endif
-#define CHBIND_SERVICE_NAME_FLAG 0x01
-#define CHBIND_HOST_NAME_FLAG 0x02
-#define CHBIND_SERVICE_SPECIFIC_FLAG 0x04
-#define CHBIND_REALM_NAME_FLAG 0x08
-
-extern void TestFunc();
+#define CHBIND_SERVICE_NAME_FLAG 0x01
+#define CHBIND_HOST_NAME_FLAG 0x02
+#define CHBIND_SERVICE_SPECIFIC_FLAG 0x04
+#define CHBIND_REALM_NAME_FLAG 0x08
static OM_uint32
peerInitEapChannelBinding(OM_uint32 *minor, gss_ctx_id_t ctx)
{
struct wpabuf *buf = NULL;
- unsigned int requested = 0;
- krb5_principal princ;
- gss_buffer_desc nameBuf;
+ unsigned int chbindReqFlags = 0;
+ krb5_principal princ = NULL;
+ gss_buffer_desc nameBuf = GSS_C_EMPTY_BUFFER;
OM_uint32 major = GSS_S_COMPLETE;
krb5_context krbContext = NULL;
- /* must have acceptor name, but already checked in
- * eapGssSmInitAcceptorName(), so maybe redunadant
- * to do so here as well? */
- if (!ctx->acceptorName) {
+ /* XXX is this check redundant? */
+ if (ctx->acceptorName == GSS_C_NO_NAME) {
+ major = GSS_S_BAD_NAME;
*minor = GSSEAP_NO_ACCEPTOR_NAME;
- return GSS_S_BAD_NAME;
+ goto cleanup;
}
princ = ctx->acceptorName->krbPrincipal;
major = gssEapRadiusAddAttr(minor, &buf, PW_GSS_ACCEPTOR_SERVICE_NAME,
0, &nameBuf);
if (GSS_ERROR(major))
- goto init_chbind_cleanup;
- requested |= CHBIND_SERVICE_NAME_FLAG;
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_SERVICE_NAME_FLAG;
}
krbPrincComponentToGssBuffer(princ, 1, &nameBuf);
major = gssEapRadiusAddAttr(minor, &buf, PW_GSS_ACCEPTOR_HOST_NAME,
0, &nameBuf);
if (GSS_ERROR(major))
- goto init_chbind_cleanup;
- requested |= CHBIND_HOST_NAME_FLAG;
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_HOST_NAME_FLAG;
}
GSSEAP_KRB_INIT(&krbContext);
+
*minor = krbPrincUnparseServiceSpecifics(krbContext, princ, &nameBuf);
- if (*minor)
- goto init_chbind_cleanup;
+ if (*minor != 0)
+ goto cleanup;
if (nameBuf.length > 0) {
major = gssEapRadiusAddAttr(minor, &buf,
PW_GSS_ACCEPTOR_SERVICE_SPECIFICS,
0, &nameBuf);
- if (GSS_ERROR(major)) {
- krbFreeUnparsedName(krbContext, &nameBuf);
- goto init_chbind_cleanup;
- }
- requested |= CHBIND_SERVICE_SPECIFIC_FLAG;
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_SERVICE_SPECIFIC_FLAG;
}
- krbFreeUnparsedName(krbContext, &nameBuf);
+ krbFreeUnparsedName(krbContext, &nameBuf);
krbPrincRealmToGssBuffer(princ, &nameBuf);
+
if (nameBuf.length > 0) {
major = gssEapRadiusAddAttr(minor, &buf,
PW_GSS_ACCEPTOR_REALM_NAME,
0, &nameBuf);
- requested |= CHBIND_REALM_NAME_FLAG;
+ if (GSS_ERROR(major))
+ goto cleanup;
+
+ chbindReqFlags |= CHBIND_REALM_NAME_FLAG;
}
- if (requested==0) {
- wpabuf_free(buf);
+ if (chbindReqFlags == 0) {
+ major = GSS_S_BAD_NAME;
*minor = GSSEAP_BAD_ACCEPTOR_NAME;
- return GSS_S_BAD_NAME;
+ goto cleanup;
}
+
ctx->initiatorCtx.chbindData = buf;
- ctx->initiatorCtx.chbindReqFlags = requested;
+ ctx->initiatorCtx.chbindReqFlags = chbindReqFlags;
+
buf = NULL;
-init_chbind_cleanup:
+
+ major = GSS_S_COMPLETE;
+ *minor = 0;
+
+cleanup:
+ /*namebuf is freed when used and may be left with a unowned pointer*/
wpabuf_free(buf);
+
return major;
}
peerProcessChbindResponse(void *context, int code, int nsid,
u8 *data, size_t len)
{
- radius_parser msg;
+ radius_parser msg;
gss_ctx_id_t ctx = (gss_ctx_id_t )context;
void *vsadata;
u8 type;
u32 vendor_id;
- u32 accepted = 0;
+ u32 chbindRetFlags = 0;
size_t vsadata_len;
if (nsid != CHBIND_NSID_RADIUS)
return;
+
+ if (data == NULL)
+ return;
msg = radius_parser_start(data, len);
- if (!msg)
+ if (msg == NULL)
return;
+
while (radius_parser_parse_tlv(msg, &type, &vendor_id, &vsadata,
&vsadata_len) == 0) {
-
- switch (type) {
- case PW_GSS_ACCEPTOR_SERVICE_NAME:
- accepted |= CHBIND_SERVICE_NAME_FLAG;
- break;
- case PW_GSS_ACCEPTOR_HOST_NAME:
- accepted |= CHBIND_HOST_NAME_FLAG;
- break;
- case PW_GSS_ACCEPTOR_SERVICE_SPECIFICS:
- accepted |= CHBIND_SERVICE_SPECIFIC_FLAG;
- break;
- case PW_GSS_ACCEPTOR_REALM_NAME:
- accepted |= CHBIND_REALM_NAME_FLAG;
- break;
- }
+ switch (type) {
+ case PW_GSS_ACCEPTOR_SERVICE_NAME:
+ chbindRetFlags |= CHBIND_SERVICE_NAME_FLAG;
+ break;
+ case PW_GSS_ACCEPTOR_HOST_NAME:
+ chbindRetFlags |= CHBIND_HOST_NAME_FLAG;
+ break;
+ case PW_GSS_ACCEPTOR_SERVICE_SPECIFICS:
+ chbindRetFlags |= CHBIND_SERVICE_SPECIFIC_FLAG;
+ break;
+ case PW_GSS_ACCEPTOR_REALM_NAME:
+ chbindRetFlags |= CHBIND_REALM_NAME_FLAG;
+ break;
+ }
}
+
radius_parser_finish(msg);
- if ((code == CHBIND_CODE_SUCCESS) &&
- ((accepted & ctx->initiatorCtx.chbindReqFlags) == ctx->initiatorCtx.chbindReqFlags)) {
+
+ if (code == CHBIND_CODE_SUCCESS &&
+ ((chbindRetFlags & ctx->initiatorCtx.chbindReqFlags) == ctx->initiatorCtx.chbindReqFlags)) {
ctx->flags |= CTX_FLAG_EAP_CHBIND_ACCEPT;
ctx->gssFlags |= GSS_C_MUTUAL_FLAG;
- /* Accepted! */
- } else {
- /* log failures? */
- }
+ } /* else log failures? */
}
static OM_uint32
OM_uint32 major;
krb5_context krbContext;
struct eap_peer_config *eapPeerConfig = &ctx->initiatorCtx.eapPeerConfig;
+ struct wpa_config_blob *configBlobs = ctx->initiatorCtx.configBlobs;
gss_buffer_desc identity = GSS_C_EMPTY_BUFFER;
gss_buffer_desc realm = GSS_C_EMPTY_BUFFER;
gss_cred_id_t cred = ctx->cred;
eapPeerConfig->anonymous_identity_len = 0;
eapPeerConfig->password = NULL;
eapPeerConfig->password_len = 0;
+ eapPeerConfig->eap_methods = (struct eap_method_type *) allowed_eap_method_types;
GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
eapPeerConfig->anonymous_identity_len = 1 + realm.length;
/* password */
- eapPeerConfig->password = (unsigned char *)cred->password.value;
- eapPeerConfig->password_len = cred->password.length;
+ if ((cred->flags & CRED_FLAG_CERTIFICATE) == 0) {
+ eapPeerConfig->password = (unsigned char *)cred->password.value;
+ eapPeerConfig->password_len = cred->password.length;
+ }
/* certs */
eapPeerConfig->ca_cert = (unsigned char *)cred->caCertificate.value;
eapPeerConfig->subject_match = (unsigned char *)cred->subjectNameConstraint.value;
eapPeerConfig->altsubject_match = (unsigned char *)cred->subjectAltNameConstraint.value;
+ configBlobs[CONFIG_BLOB_CA_CERT].data = cred->caCertificateBlob.value;
+ configBlobs[CONFIG_BLOB_CA_CERT].len = cred->caCertificateBlob.length;
/* eap channel binding */
- if (ctx->initiatorCtx.chbindData)
- {
+ if (ctx->initiatorCtx.chbindData != NULL) {
struct eap_peer_chbind_config *chbind_config =
- (struct eap_peer_chbind_config *)
- GSSEAP_MALLOC(sizeof(struct eap_peer_chbind_config));
+ (struct eap_peer_chbind_config *)GSSEAP_MALLOC(sizeof(struct eap_peer_chbind_config));
if (chbind_config == NULL) {
*minor = ENOMEM;
return GSS_S_FAILURE;
eapPeerConfig->chbind_config = NULL;
eapPeerConfig->chbind_config_len = 0;
}
+ if (cred->flags & CRED_FLAG_CERTIFICATE) {
+ /*
+ * CRED_FLAG_CONFIG_BLOB is an internal flag which will be used in the
+ * future to directly pass certificate and private key data to the
+ * EAP implementation, rather than an indirected string pointer.
+ */
+ if (cred->flags & CRED_FLAG_CONFIG_BLOB) {
+ eapPeerConfig->client_cert = (unsigned char *)"blob://client-cert";
+ configBlobs[CONFIG_BLOB_CLIENT_CERT].data = cred->clientCertificate.value;
+ configBlobs[CONFIG_BLOB_CLIENT_CERT].len = cred->clientCertificate.length;
+
+ eapPeerConfig->client_cert = (unsigned char *)"blob://private-key";
+ configBlobs[CONFIG_BLOB_PRIVATE_KEY].data = cred->clientCertificate.value;
+ configBlobs[CONFIG_BLOB_PRIVATE_KEY].len = cred->privateKey.length;
+ } else {
+ eapPeerConfig->client_cert = (unsigned char *)cred->clientCertificate.value;
+ eapPeerConfig->private_key = (unsigned char *)cred->privateKey.value;
+ }
+ eapPeerConfig->private_key_passwd = (unsigned char *)cred->password.value;
+ }
+
*minor = 0;
return GSS_S_COMPLETE;
}
outputToken, NULL);
if (GSS_ERROR(major))
return major;
- } else if (inputToken != GSS_C_NO_BUFFER &&
- ctx->acceptorName == GSS_C_NO_NAME) {
- /* Accept target name hint from acceptor */
+ } else if (inputToken != GSS_C_NO_BUFFER) {
+ OM_uint32 tmpMinor;
+ gss_name_t nameHint;
+ int equal;
+
+ /* Accept target name hint from acceptor or verify acceptor */
major = gssEapImportName(minor, inputToken,
GSS_C_NT_USER_NAME,
ctx->mechanismUsed,
- &ctx->acceptorName);
+ &nameHint);
if (GSS_ERROR(major))
return major;
+
+ if (ctx->acceptorName != GSS_C_NO_NAME) {
+ /* verify name hint matched asserted acceptor name */
+ major = gssEapCompareName(minor,
+ nameHint,
+ ctx->acceptorName,
+ COMPARE_NAME_FLAG_IGNORE_EMPTY_REALMS,
+ &equal);
+ if (GSS_ERROR(major)) {
+ gssEapReleaseName(&tmpMinor, &nameHint);
+ return major;
+ }
+
+ gssEapReleaseName(&tmpMinor, &nameHint);
+
+ if (!equal) {
+ *minor = GSSEAP_WRONG_ACCEPTOR_NAME;
+ return GSS_S_DEFECTIVE_TOKEN;
+ }
+ } else { /* acceptor name is no_name */
+ /* accept acceptor name hint */
+ ctx->acceptorName = nameHint;
+ nameHint = GSS_C_NO_NAME;
+ }
}
+
/*
* Currently, other parts of the code assume that the acceptor name
* is available, hence this check.
/*
* Generate channel binding data
*/
- if (ctx->initiatorCtx.chbindData == NULL)
- {
+ if (ctx->initiatorCtx.chbindData == NULL) {
major = peerInitEapChannelBinding(minor, ctx);
if (GSS_ERROR(major))
return major;
unsigned char wireFlags[4];
gss_buffer_desc flagsBuf;
+ /*
+ * As a temporary measure, force mutual authentication until channel binding is
+ * more widely deployed.
+ */
+ ctx->gssFlags |= GSS_C_MUTUAL_FLAG;
store_uint32_be(ctx->gssFlags & GSSEAP_WIRE_FLAGS_MASK, wireFlags);
flagsBuf.length = sizeof(wireFlags);
OM_uint32 *smFlags)
{
OM_uint32 major;
- gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER;
+ krb5_error_code code;
+ krb5_context krbContext;
+ krb5_data data;
+ krb5_checksum cksum;
+ gss_buffer_desc cksumBuffer;
- if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS)
- buffer = chanBindings->application_data;
+ if (chanBindings == GSS_C_NO_CHANNEL_BINDINGS ||
+ chanBindings->application_data.length == 0)
+ return GSS_S_CONTINUE_NEEDED;
- major = gssEapWrap(minor, ctx, TRUE, GSS_C_QOP_DEFAULT,
- &buffer, NULL, outputToken);
- if (GSS_ERROR(major))
- return major;
+ GSSEAP_KRB_INIT(&krbContext);
+
+ KRB_DATA_INIT(&data);
+
+ gssBufferToKrbData(&chanBindings->application_data, &data);
- GSSEAP_ASSERT(outputToken->value != NULL);
+ code = krb5_c_make_checksum(krbContext, ctx->checksumType,
+ &ctx->rfc3961Key,
+ KEY_USAGE_GSSEAP_CHBIND_MIC,
+ &data, &cksum);
+ if (code != 0) {
+ *minor = code;
+ return GSS_S_FAILURE;
+ }
+
+ cksumBuffer.length = KRB_CHECKSUM_LENGTH(&cksum);
+ cksumBuffer.value = KRB_CHECKSUM_DATA(&cksum);
+
+ major = duplicateBuffer(minor, &cksumBuffer, outputToken);
+ if (GSS_ERROR(major)) {
+ krb5_free_checksum_contents(krbContext, &cksum);
+ return major;
+ }
*minor = 0;
*smFlags |= SM_FLAG_OUTPUT_TOKEN_CRITICAL;
+ krb5_free_checksum_contents(krbContext, &cksum);
+
return GSS_S_CONTINUE_NEEDED;
}
return GSS_S_CONTINUE_NEEDED;
}
-
+
#ifdef GSSEAP_ENABLE_REAUTH
static OM_uint32
eapGssSmInitReauthCreds(OM_uint32 *minor,
{
ITOK_TYPE_ACCEPTOR_NAME_RESP,
ITOK_TYPE_ACCEPTOR_NAME_REQ,
- GSSEAP_STATE_INITIAL | GSSEAP_STATE_AUTHENTICATE,
+ GSSEAP_STATE_INITIAL | GSSEAP_STATE_AUTHENTICATE |
+ GSSEAP_STATE_ACCEPTOR_EXTS,
0,
eapGssSmInitAcceptorName
},
ITOK_TYPE_NONE,
ITOK_TYPE_GSS_CHANNEL_BINDINGS,
GSSEAP_STATE_INITIATOR_EXTS,
- SM_ITOK_FLAG_REQUIRED,
+ 0,
eapGssSmInitGssChannelBindings
},
{
if (ret_flags != NULL)
*ret_flags = ctx->gssFlags;
- if (major == GSS_S_COMPLETE)
- major = major;
if (time_rec != NULL)
gssEapContextTime(&tmpMinor, ctx, time_rec);