diff --git a/hostapd/Makefile b/hostapd/Makefile index 65c5e9195..a8d77fed3 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -620,6 +620,15 @@ LIBS += -ldl endif endif +ifdef CONFIG_MACSEC +CFLAGS += -DCONFIG_MACSEC +OBJS += ../src/ap/wpa_auth_kay.o +OBJS += ../src/pae/ieee802_1x_cp.o +OBJS += ../src/pae/ieee802_1x_kay.o +OBJS += ../src/pae/ieee802_1x_key.o +OBJS += ../src/pae/ieee802_1x_secy_ops.o +endif + # Basic EAP functionality is needed for EAPOL OBJS += eap_register.o OBJS += ../src/eap_server/eap_server.o diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index 55093adbe..c83fb2a46 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -51,6 +51,7 @@ #include "acs.h" #include "hs20.h" #include "airtime_policy.h" +#include "wpa_auth_kay.h" static int hostapd_flush_old_stations(struct hostapd_data *hapd, u16 reason); @@ -373,6 +374,7 @@ static void hostapd_free_hapd_data(struct hostapd_data *hapd) #endif /* CONFIG_NO_RADIUS */ hostapd_deinit_wps(hapd); + ieee802_1x_dealloc_kay_sm_hapd(hapd); #ifdef CONFIG_DPP hostapd_dpp_deinit(hapd); gas_query_ap_deinit(hapd->gas); @@ -3047,6 +3049,14 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta, eloop_register_timeout(hapd->conf->ap_max_inactivity, 0, ap_handle_timer, hapd, sta); } + +#ifdef CONFIG_MACSEC + if (hapd->conf->wpa_key_mgmt == WPA_KEY_MGMT_NONE && + hapd->conf->mka_psk_set) + ieee802_1x_create_preshared_mka_hapd(hapd, sta); + else + ieee802_1x_alloc_kay_sm_hapd(hapd, sta); +#endif /* CONFIG_MACSEC */ } diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h index 52b5dbc69..d90bae4e6 100644 --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -232,6 +232,10 @@ struct hostapd_data { struct wps_stat wps_stats; #endif /* CONFIG_WPS */ +#ifdef CONFIG_MACSEC + struct ieee802_1x_kay *kay; +#endif /* CONFIG_MACSEC */ + struct hostapd_probereq_cb *probereq_cb; size_t num_probereq_cb; diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c index 94167b687..0edf74394 100644 --- a/src/ap/ieee802_1x.c +++ b/src/ap/ieee802_1x.c @@ -34,6 +34,7 @@ /* FIX: Not really a good thing to require ieee802_11.h here.. (FILS) */ #include "ieee802_11.h" #include "ieee802_1x.h" +#include "wpa_auth_kay.h" #ifdef CONFIG_HS20 @@ -2885,6 +2886,10 @@ static void ieee802_1x_finished(struct hostapd_data *hapd, } #endif /* CONFIG_HS20 */ +#ifdef CONFIG_MACSEC + ieee802_1x_notify_create_actor_hapd(hapd, sta); +#endif /* CONFIG_MACSEC */ + key = ieee802_1x_get_key(sta->eapol_sm, &len); if (sta->session_timeout_set) { os_get_reltime(&now); diff --git a/src/ap/wpa_auth_kay.c b/src/ap/wpa_auth_kay.c new file mode 100644 index 000000000..b6e47979b --- /dev/null +++ b/src/ap/wpa_auth_kay.c @@ -0,0 +1,523 @@ +/* + * IEEE 802.1X-2010 KaY Interface + * Copyright (c) 2019, The Linux Foundation + * + * This software may be distributed under the terms of the BSD license. + * See README for more details. + */ + +#include "utils/includes.h" + +#include "utils/common.h" +#include "pae/ieee802_1x_key.h" +#include "pae/ieee802_1x_kay.h" +#include "hostapd.h" +#include "sta_info.h" +#include "wpa_auth_kay.h" +#include "ieee802_1x.h" + + +#define DEFAULT_KEY_LEN 16 +/* secure Connectivity Association Key Name (CKN) */ +#define DEFAULT_CKN_LEN 16 + + +static int hapd_macsec_init(void *priv, struct macsec_init_params *params) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->macsec_init) + return -1; + return hapd->driver->macsec_init(hapd->drv_priv, params); +} + + +static int hapd_macsec_deinit(void *priv) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->macsec_deinit) + return -1; + return hapd->driver->macsec_deinit(hapd->drv_priv); +} + + +static int hapd_macsec_get_capability(void *priv, enum macsec_cap *cap) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->macsec_get_capability) + return -1; + return hapd->driver->macsec_get_capability(hapd->drv_priv, cap); +} + + +static int hapd_enable_protect_frames(void *priv, Boolean enabled) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->enable_protect_frames) + return -1; + return hapd->driver->enable_protect_frames(hapd->drv_priv, enabled); +} + + +static int hapd_enable_encrypt(void *priv, Boolean enabled) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->enable_encrypt) + return -1; + return hapd->driver->enable_encrypt(hapd->drv_priv, enabled); +} + + +static int hapd_set_replay_protect(void *priv, Boolean enabled, u32 window) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->set_replay_protect) + return -1; + return hapd->driver->set_replay_protect(hapd->drv_priv, enabled, + window); +} + + +static int hapd_set_current_cipher_suite(void *priv, u64 cs) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->set_current_cipher_suite) + return -1; + return hapd->driver->set_current_cipher_suite(hapd->drv_priv, cs); +} + + +static int hapd_enable_controlled_port(void *priv, Boolean enabled) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->enable_controlled_port) + return -1; + return hapd->driver->enable_controlled_port(hapd->drv_priv, enabled); +} + + +static int hapd_get_receive_lowest_pn(void *priv, struct receive_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->get_receive_lowest_pn) + return -1; + return hapd->driver->get_receive_lowest_pn(hapd->drv_priv, sa); +} + + +static int hapd_get_transmit_next_pn(void *priv, struct transmit_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->get_transmit_next_pn) + return -1; + return hapd->driver->get_transmit_next_pn(hapd->drv_priv, sa); +} + + +static int hapd_set_transmit_next_pn(void *priv, struct transmit_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->set_transmit_next_pn) + return -1; + return hapd->driver->set_transmit_next_pn(hapd->drv_priv, sa); +} + + +static unsigned int conf_offset_val(enum confidentiality_offset co) +{ + switch (co) { + case CONFIDENTIALITY_OFFSET_30: + return 30; + break; + case CONFIDENTIALITY_OFFSET_50: + return 50; + default: + return 0; + } +} + + +static int hapd_create_receive_sc(void *priv, struct receive_sc *sc, + enum validate_frames vf, + enum confidentiality_offset co) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->create_receive_sc) + return -1; + return hapd->driver->create_receive_sc(hapd->drv_priv, sc, + conf_offset_val(co), vf); +} + + +static int hapd_delete_receive_sc(void *priv, struct receive_sc *sc) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->delete_receive_sc) + return -1; + return hapd->driver->delete_receive_sc(hapd->drv_priv, sc); +} + + +static int hapd_create_receive_sa(void *priv, struct receive_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->create_receive_sa) + return -1; + return hapd->driver->create_receive_sa(hapd->drv_priv, sa); +} + + +static int hapd_delete_receive_sa(void *priv, struct receive_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->delete_receive_sa) + return -1; + return hapd->driver->delete_receive_sa(hapd->drv_priv, sa); +} + + +static int hapd_enable_receive_sa(void *priv, struct receive_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->enable_receive_sa) + return -1; + return hapd->driver->enable_receive_sa(hapd->drv_priv, sa); +} + + +static int hapd_disable_receive_sa(void *priv, struct receive_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->disable_receive_sa) + return -1; + return hapd->driver->disable_receive_sa(hapd->drv_priv, sa); +} + + +static int +hapd_create_transmit_sc(void *priv, struct transmit_sc *sc, + enum confidentiality_offset co) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->create_transmit_sc) + return -1; + return hapd->driver->create_transmit_sc(hapd->drv_priv, sc, + conf_offset_val(co)); +} + + +static int hapd_delete_transmit_sc(void *priv, struct transmit_sc *sc) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->delete_transmit_sc) + return -1; + return hapd->driver->delete_transmit_sc(hapd->drv_priv, sc); +} + + +static int hapd_create_transmit_sa(void *priv, struct transmit_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->create_transmit_sa) + return -1; + return hapd->driver->create_transmit_sa(hapd->drv_priv, sa); +} + + +static int hapd_delete_transmit_sa(void *priv, struct transmit_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->delete_transmit_sa) + return -1; + return hapd->driver->delete_transmit_sa(hapd->drv_priv, sa); +} + + +static int hapd_enable_transmit_sa(void *priv, struct transmit_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->enable_transmit_sa) + return -1; + return hapd->driver->enable_transmit_sa(hapd->drv_priv, sa); +} + + +static int hapd_disable_transmit_sa(void *priv, struct transmit_sa *sa) +{ + struct hostapd_data *hapd = priv; + + if (!hapd->driver->disable_transmit_sa) + return -1; + return hapd->driver->disable_transmit_sa(hapd->drv_priv, sa); +} + + +int ieee802_1x_alloc_kay_sm_hapd(struct hostapd_data *hapd, + struct sta_info *sta) +{ + struct ieee802_1x_kay_ctx *kay_ctx; + struct ieee802_1x_kay *res = NULL; + enum macsec_policy policy; + + ieee802_1x_dealloc_kay_sm_hapd(hapd); + + if (!hapd->conf || hapd->conf->macsec_policy == 0) + return 0; + + if (hapd->conf->macsec_policy == 1) { + if (hapd->conf->macsec_integ_only == 1) + policy = SHOULD_SECURE; + else + policy = SHOULD_ENCRYPT; + } else { + policy = DO_NOT_SECURE; + } + + wpa_printf(MSG_DEBUG, "%s: if_name=%s", __func__, hapd->conf->iface); + kay_ctx = os_zalloc(sizeof(*kay_ctx)); + if (!kay_ctx) + return -1; + + kay_ctx->ctx = hapd; + + kay_ctx->macsec_init = hapd_macsec_init; + kay_ctx->macsec_deinit = hapd_macsec_deinit; + kay_ctx->macsec_get_capability = hapd_macsec_get_capability; + kay_ctx->enable_protect_frames = hapd_enable_protect_frames; + kay_ctx->enable_encrypt = hapd_enable_encrypt; + kay_ctx->set_replay_protect = hapd_set_replay_protect; + kay_ctx->set_current_cipher_suite = hapd_set_current_cipher_suite; + kay_ctx->enable_controlled_port = hapd_enable_controlled_port; + kay_ctx->get_receive_lowest_pn = hapd_get_receive_lowest_pn; + kay_ctx->get_transmit_next_pn = hapd_get_transmit_next_pn; + kay_ctx->set_transmit_next_pn = hapd_set_transmit_next_pn; + kay_ctx->create_receive_sc = hapd_create_receive_sc; + kay_ctx->delete_receive_sc = hapd_delete_receive_sc; + kay_ctx->create_receive_sa = hapd_create_receive_sa; + kay_ctx->delete_receive_sa = hapd_delete_receive_sa; + kay_ctx->enable_receive_sa = hapd_enable_receive_sa; + kay_ctx->disable_receive_sa = hapd_disable_receive_sa; + kay_ctx->create_transmit_sc = hapd_create_transmit_sc; + kay_ctx->delete_transmit_sc = hapd_delete_transmit_sc; + kay_ctx->create_transmit_sa = hapd_create_transmit_sa; + kay_ctx->delete_transmit_sa = hapd_delete_transmit_sa; + kay_ctx->enable_transmit_sa = hapd_enable_transmit_sa; + kay_ctx->disable_transmit_sa = hapd_disable_transmit_sa; + + res = ieee802_1x_kay_init(kay_ctx, policy, + hapd->conf->macsec_replay_protect, + hapd->conf->macsec_replay_window, + hapd->conf->macsec_port, + hapd->conf->mka_priority, hapd->conf->iface, + hapd->own_addr); + /* ieee802_1x_kay_init() frees kay_ctx on failure */ + if (!res) + return -1; + + hapd->kay = res; + + return 0; +} + + +void ieee802_1x_dealloc_kay_sm_hapd(struct hostapd_data *hapd) +{ + if (!hapd->kay) + return; + + ieee802_1x_kay_deinit(hapd->kay); + hapd->kay = NULL; +} + + +static int ieee802_1x_auth_get_session_id(struct hostapd_data *hapd, + struct sta_info *sta, u8 *sid, + size_t *len) +{ + const u8 *session_id; + size_t id_len, need_len; + + session_id = ieee802_1x_get_session_id(sta->eapol_sm, &id_len); + if (!session_id) { + wpa_printf(MSG_DEBUG, + "MACsec: Failed to get SessionID from EAPOL state machines"); + return -1; + } + + need_len = 1 + 2 * 32 /* random size */; + if (need_len > id_len) { + wpa_printf(MSG_DEBUG, "EAP Session-Id not long enough"); + return -1; + } + + os_memcpy(sid, session_id, need_len); + *len = need_len; + + return 0; +} + + +static int ieee802_1x_auth_get_msk(struct hostapd_data *hapd, + struct sta_info *sta, u8 *msk, size_t *len) +{ + const u8 *key; + size_t keylen; + + if (!sta->eapol_sm) + return -1; + + key = ieee802_1x_get_key(sta->eapol_sm, &keylen); + if (key == NULL) { + wpa_printf(MSG_DEBUG, + "MACsec: Failed to get MSK from EAPOL state machines"); + return -1; + } + wpa_printf(MSG_DEBUG, "MACsec: Successfully fetched key (len=%lu)", + (unsigned long) keylen); + wpa_hexdump_key(MSG_DEBUG, "MSK: ", key, keylen); + + if (keylen > *len) + keylen = *len; + os_memcpy(msk, key, keylen); + *len = keylen; + + return 0; +} + + +void * ieee802_1x_notify_create_actor_hapd(struct hostapd_data *hapd, + struct sta_info *sta) +{ + u8 *sid; + size_t sid_len = 128; + struct mka_key_name *ckn; + struct mka_key *cak; + struct mka_key *msk; + void *res = NULL; + + if (!hapd->kay || hapd->kay->policy == DO_NOT_SECURE) + return NULL; + + wpa_printf(MSG_DEBUG, + "IEEE 802.1X: External notification - Create MKA for " + MACSTR, MAC2STR(sta->addr)); + + msk = os_zalloc(sizeof(*msk)); + sid = os_zalloc(sid_len); + ckn = os_zalloc(sizeof(*ckn)); + cak = os_zalloc(sizeof(*cak)); + if (!msk || !sid || !ckn || !cak) + goto fail; + + msk->len = DEFAULT_KEY_LEN; + if (ieee802_1x_auth_get_msk(hapd, sta, msk->key, &msk->len)) { + wpa_printf(MSG_ERROR, "IEEE 802.1X: Could not get MSK"); + goto fail; + } + + if (ieee802_1x_auth_get_session_id(hapd, sta, sid, &sid_len)) + { + wpa_printf(MSG_ERROR, + "IEEE 802.1X: Could not get EAP Session Id"); + goto fail; + } + + wpa_hexdump(MSG_DEBUG, "own_addr", hapd->own_addr, ETH_ALEN); + wpa_hexdump(MSG_DEBUG, "sta_addr", sta->addr, ETH_ALEN); + + /* Derive CAK from MSK */ + cak->len = DEFAULT_KEY_LEN; + if (ieee802_1x_cak_aes_cmac(msk->key, msk->len, hapd->own_addr, + sta->addr, cak->key, cak->len)) { + wpa_printf(MSG_ERROR, "IEEE 802.1X: Deriving CAK failed"); + goto fail; + } + wpa_hexdump_key(MSG_DEBUG, "Derived CAK", cak->key, cak->len); + + /* Derive CKN from MSK */ + ckn->len = DEFAULT_CKN_LEN; + if (ieee802_1x_ckn_aes_cmac(msk->key, msk->len, hapd->own_addr, + sta->addr, sid, sid_len, ckn->name)) { + wpa_printf(MSG_ERROR, "IEEE 802.1X: Deriving CKN failed"); + goto fail; + } + wpa_hexdump(MSG_DEBUG, "Derived CKN", ckn->name, ckn->len); + + res = ieee802_1x_kay_create_mka(hapd->kay, ckn, cak, 0, EAP_EXCHANGE, + TRUE); + +fail: + bin_clear_free(msk, sizeof(*msk)); + os_free(sid); + os_free(ckn); + bin_clear_free(cak, sizeof(*cak)); + + return res; +} + + +void * ieee802_1x_create_preshared_mka_hapd(struct hostapd_data *hapd, + struct sta_info *sta) +{ + struct mka_key *cak; + struct mka_key_name *ckn; + void *res = NULL; + + if ((hapd->conf->mka_psk_set & MKA_PSK_SET) != MKA_PSK_SET) + goto end; + + ckn = os_zalloc(sizeof(*ckn)); + if (!ckn) + goto end; + + cak = os_zalloc(sizeof(*cak)); + if (!cak) + goto free_ckn; + + if (ieee802_1x_alloc_kay_sm_hapd(hapd, sta) < 0 || !hapd->kay) + goto free_cak; + + if (hapd->kay->policy == DO_NOT_SECURE) + goto dealloc; + + cak->len = hapd->conf->mka_cak_len; + os_memcpy(cak->key, hapd->conf->mka_cak, cak->len); + + ckn->len = hapd->conf->mka_ckn_len;; + os_memcpy(ckn->name, hapd->conf->mka_ckn, ckn->len); + + res = ieee802_1x_kay_create_mka(hapd->kay, ckn, cak, 0, PSK, TRUE); + if (res) + goto free_cak; + +dealloc: + /* Failed to create MKA */ + ieee802_1x_dealloc_kay_sm_hapd(hapd); +free_cak: + os_free(cak); +free_ckn: + os_free(ckn); +end: + return res; +} diff --git a/src/ap/wpa_auth_kay.h b/src/ap/wpa_auth_kay.h new file mode 100644 index 000000000..0dd7e4124 --- /dev/null +++ b/src/ap/wpa_auth_kay.h @@ -0,0 +1,51 @@ +/* + * IEEE 802.1X-2010 KaY Interface + * Copyright (c) 2019, The Linux Foundation + * + * This software may be distributed under the terms of the BSD license. + * See README for more details. + */ + +#ifndef WPA_AUTH_KAY_H +#define WPA_AUTH_KAY_H + +#ifdef CONFIG_MACSEC + +int ieee802_1x_alloc_kay_sm_hapd(struct hostapd_data *hapd, + struct sta_info *sta); +void * ieee802_1x_notify_create_actor_hapd(struct hostapd_data *hapd, + struct sta_info *sta); +void ieee802_1x_dealloc_kay_sm_hapd(struct hostapd_data *hapd); + +void * ieee802_1x_create_preshared_mka_hapd(struct hostapd_data *hapd, + struct sta_info *sta); + +#else /* CONFIG_MACSEC */ + +static inline int ieee802_1x_alloc_kay_sm_hapd(struct hostapd_data *hapd, + struct sta_info *sta) +{ + return 0; +} + +static inline void * +ieee802_1x_notify_create_actor_hapd(struct hostapd_data *hapd, + struct sta_info *sta) +{ + return NULL; +} + +static inline void ieee802_1x_dealloc_kay_sm_hapd(struct hostapd_data *hapd) +{ +} + +static inline void * +ieee802_1x_create_preshared_mka_hapd(struct hostapd_data *hapd, + struct sta_info *sta) +{ + return NULL; +} + +#endif /* CONFIG_MACSEC */ + +#endif /* WPA_AUTH_KAY_H */ diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 3e5610457..348f9015c 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -860,6 +860,9 @@ OBJS += ../src/pae/ieee802_1x_cp.o OBJS += ../src/pae/ieee802_1x_kay.o OBJS += ../src/pae/ieee802_1x_key.o OBJS += ../src/pae/ieee802_1x_secy_ops.o +ifdef CONFIG_AP +OBJS += ../src/ap/wpa_auth_kay.o +endif endif ifdef CONFIG_IEEE8021X_EAPOL