MACsec: Support GCM-AES-256 cipher suite

Allow macsec_csindex to be configured and select the cipher suite when
the participant acts as a key server.

Signed-off-by: leiwei <quic_leiwei@quicinc.com>

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index b14728d1b507df65bc936b1ecf706f70c0e19ce8..d416e5b771ee096a7a52b183d056a778a5e21133 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -4661,6 +4661,16 @@ static int hostapd_config_fill(struct hostapd_config *conf,
                        return 1;
                }
                bss->mka_priority = mka_priority;
+       } else if (os_strcmp(buf, "macsec_csindex") == 0) {
+               int macsec_csindex = atoi(pos);
+
+               if (macsec_csindex < 0 || macsec_csindex > 1) {
+                       wpa_printf(MSG_ERROR,
+                                  "Line %d: invalid macsec_csindex (%d): '%s'.",
+                                  line, macsec_csindex, pos);
+                       return 1;
+               }
+               bss->macsec_csindex = macsec_csindex;
        } else if (os_strcmp(buf, "mka_cak") == 0) {
                size_t len = os_strlen(pos);
 

diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 3c2019f730485f4047566a95fd4eb8230cbfb4db..9b0c809ea73fb350f736dfcd45389a554c2cf22c 100644 (file)
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -1070,6 +1070,10 @@ eapol_key_index_workaround=0
 # mka_priority (Priority of MKA Actor)
 # Range: 0..255 (default: 255)
 #
+# macsec_csindex: IEEE 802.1X/MACsec cipher suite
+# 0 = GCM-AES-128 (default)
+# 1 = GCM-AES-256 (default)
+#
 # mka_cak, mka_ckn, and mka_priority: IEEE 802.1X/MACsec pre-shared key mode
 # This allows to configure MACsec with a pre-shared key using a (CAK,CKN) pair.
 # In this mode, instances of hostapd can act as MACsec peers. The peer

diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 49cd3168a2fa3785a63dcd0dbc715511476a939d..1e21f7c9638027c4e5bd7f3d5b0e7e266f0f2aa2 100644 (file)
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -848,6 +848,13 @@ struct hostapd_bss_config {
         */
        int mka_priority;
 
+       /**
+        * macsec_csindex - Cipher suite index for MACsec
+        *
+        * Range: 0-1 (default: 0)
+        */
+       int macsec_csindex;
+
        /**
         * mka_ckn - MKA pre-shared CKN
         */

diff --git a/src/ap/wpa_auth_kay.c b/src/ap/wpa_auth_kay.c
index 46d94b43f83e4eda59c18b904ea13ce12c9ea4ea..ea4e9b29a444e92a7afc852bc4086525ccb6726d 100644 (file)
--- a/src/ap/wpa_auth_kay.c
+++ b/src/ap/wpa_auth_kay.c
@@ -329,7 +329,9 @@ int ieee802_1x_alloc_kay_sm_hapd(struct hostapd_data *hapd,
                                  hapd->conf->macsec_replay_protect,
                                  hapd->conf->macsec_replay_window,
                                  hapd->conf->macsec_port,
-                                 hapd->conf->mka_priority, hapd->conf->iface,
+                                 hapd->conf->mka_priority,
+                                 hapd->conf->macsec_csindex,
+                                 hapd->conf->iface,
                                  hapd->own_addr);
        /* ieee802_1x_kay_init() frees kay_ctx on failure */
        if (!res)

diff --git a/src/pae/ieee802_1x_cp.c b/src/pae/ieee802_1x_cp.c
index cf41d8dbf2f97f65ea541f70e5589cc5a1d89b35..2bf3e8e8cfad2bae94d180c229775bcfc3e1227f 100644 (file)
--- a/src/pae/ieee802_1x_cp.c
+++ b/src/pae/ieee802_1x_cp.c
@@ -20,7 +20,7 @@
 #define STATE_MACHINE_DATA struct ieee802_1x_cp_sm
 #define STATE_MACHINE_DEBUG_PREFIX "CP"
 
-static u64 default_cs_id = CS_ID_GCM_AES_128;
+static u64 cs_id[] = { CS_ID_GCM_AES_128, CS_ID_GCM_AES_256 };
 
 /* The variable defined in clause 12 in IEEE Std 802.1X-2010 */
 enum connect_type { PENDING, UNAUTHENTICATED, AUTHENTICATED, SECURE };
@@ -210,7 +210,6 @@ SM_STATE(CP, SECURED)
        sm->replay_protect = sm->kay->macsec_replay_protect;
        sm->validate_frames = sm->kay->macsec_validate;
 
-       /* NOTE: now no other than default cipher suite (AES-GCM-128) */
        sm->current_cipher_suite = sm->cipher_suite;
        secy_cp_control_current_cipher_suite(sm->kay, sm->current_cipher_suite);
 
@@ -473,8 +472,8 @@ struct ieee802_1x_cp_sm * ieee802_1x_cp_sm_init(struct ieee802_1x_kay *kay)
        sm->orx = false;
        sm->otx = false;
 
-       sm->current_cipher_suite = default_cs_id;
-       sm->cipher_suite = default_cs_id;
+       sm->current_cipher_suite = cs_id[kay->macsec_csindex];
+       sm->cipher_suite = cs_id[kay->macsec_csindex];
        sm->cipher_offset = CONFIDENTIALITY_OFFSET_0;
        sm->confidentiality_offset = sm->cipher_offset;
        sm->transmit_delay = MKA_LIFE_TIME;
@@ -491,6 +490,7 @@ struct ieee802_1x_cp_sm * ieee802_1x_cp_sm_init(struct ieee802_1x_kay *kay)
        secy_cp_control_enable_port(sm->kay, sm->controlled_port_enabled);
        secy_cp_control_confidentiality_offset(sm->kay,
                                               sm->confidentiality_offset);
+       secy_cp_control_current_cipher_suite(sm->kay, sm->current_cipher_suite);
 
        SM_STEP_RUN(CP);
 

diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c
index 657de93ae748650417cc5fd9dd170b95da69ade9..a1f8ae9341d80297a4f5856879bc20f00de7606e 100644 (file)
--- a/src/pae/ieee802_1x_kay.c
+++ b/src/pae/ieee802_1x_kay.c
@@ -221,8 +221,16 @@ ieee802_1x_mka_dump_dist_sak_body(struct ieee802_1x_mka_dist_sak_body *body)
 
        wpa_printf(MSG_DEBUG, "\tKey Number............: %d",
                   be_to_host32(body->kn));
-       /* TODO: Other than GCM-AES-128 case: MACsec Cipher Suite */
-       wpa_hexdump(MSG_DEBUG, "\tAES Key Wrap of SAK...:", body->sak, 24);
+       if (body_len == 28) {
+               wpa_hexdump(MSG_DEBUG, "\tAES Key Wrap of SAK...:",
+                           body->sak, 24);
+       } else if (body_len > CS_ID_LEN - sizeof(body->kn)) {
+               wpa_hexdump(MSG_DEBUG, "\tMACsec Cipher Suite...:",
+                           body->sak, CS_ID_LEN);
+               wpa_hexdump(MSG_DEBUG, "\tAES Key Wrap of SAK...:",
+                           body->sak + CS_ID_LEN,
+                           body_len - CS_ID_LEN - sizeof(body->kn));
+       }
 }
 
 
@@ -3456,7 +3464,8 @@ static void kay_l2_receive(void *ctx, const u8 *src_addr, const u8 *buf,
 struct ieee802_1x_kay *
 ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
                    bool macsec_replay_protect, u32 macsec_replay_window,
-                   u16 port, u8 priority, const char *ifname, const u8 *addr)
+                   u16 port, u8 priority, u32 macsec_csindex,
+                   const char *ifname, const u8 *addr)
 {
        struct ieee802_1x_kay *kay;
 
@@ -3493,7 +3502,7 @@ ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
        kay->dist_time = 0;
 
        kay->pn_exhaustion = PENDING_PN_EXHAUSTION;
-       kay->macsec_csindex = DEFAULT_CS_INDEX;
+       kay->macsec_csindex = macsec_csindex;
        kay->mka_algindex = DEFAULT_MKA_ALG_INDEX;
        kay->mka_version = MKA_VERSION_ID;
 

diff --git a/src/pae/ieee802_1x_kay.h b/src/pae/ieee802_1x_kay.h
index 1d3c2acb72f4498e7edb3f34d9d750398f62857c..11cf7b758dd027faf76ec42e31664110f76a188d 100644 (file)
--- a/src/pae/ieee802_1x_kay.h
+++ b/src/pae/ieee802_1x_kay.h
@@ -240,7 +240,8 @@ u64 mka_sci_u64(struct ieee802_1x_mka_sci *sci);
 struct ieee802_1x_kay *
 ieee802_1x_kay_init(struct ieee802_1x_kay_ctx *ctx, enum macsec_policy policy,
                    bool macsec_replay_protect, u32 macsec_replay_window,
-                   u16 port, u8 priority, const char *ifname, const u8 *addr);
+                   u16 port, u8 priority, u32 macsec_csindex,
+                   const char *ifname, const u8 *addr);
 void ieee802_1x_kay_deinit(struct ieee802_1x_kay *kay);
 
 struct ieee802_1x_mka_participant *

diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index bf062b0792b73180f89ec20a77bcdc0b9d615480..58ed8bc0ae38b6f6fb3fc9b35e0afb1adb75297f 100644 (file)
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -2612,6 +2612,7 @@ static const struct parse_data ssid_fields[] = {
        { INT(macsec_replay_window) },
        { INT_RANGE(macsec_port, 1, 65534) },
        { INT_RANGE(mka_priority, 0, 255) },
+       { INT_RANGE(macsec_csindex, 0, 1) },
        { FUNC_KEY(mka_cak) },
        { FUNC_KEY(mka_ckn) },
 #endif /* CONFIG_MACSEC */

diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index 6db5010db3a7e2ad9a0a266744a3cc888c49ec35..2dd586391e9e521d232ff5236f7b8f3b08259dc7 100644 (file)
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -810,6 +810,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
        INT(macsec_replay_window);
        INT(macsec_port);
        INT_DEF(mka_priority, DEFAULT_PRIO_NOT_KEY_SERVER);
+       INT(macsec_csindex);
 #endif /* CONFIG_MACSEC */
 #ifdef CONFIG_HS20
        INT(update_identifier);

diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index 724534dd0123fd0a757216549ee9f553b8c3222c..9b17c3b14298640031f371e4a31402a23cf13647 100644 (file)
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -911,6 +911,13 @@ struct wpa_ssid {
         */
        int mka_priority;
 
+       /**
+        * macsec_csindex - Cipher suite index for MACsec
+        *
+        * Range: 0-1 (default: 0)
+        */
+       int macsec_csindex;
+
        /**
         * mka_ckn - MKA pre-shared CKN
         */

diff --git a/wpa_supplicant/wpas_kay.c b/wpa_supplicant/wpas_kay.c
index defd0f2f7e81b7190b0e87c06804c9ef3c316c58..4d1ce027158b01d46054b8988528c88bae17bdcb 100644 (file)
--- a/wpa_supplicant/wpas_kay.c
+++ b/wpa_supplicant/wpas_kay.c
@@ -241,8 +241,8 @@ int ieee802_1x_alloc_kay_sm(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
 
        res = ieee802_1x_kay_init(kay_ctx, policy, ssid->macsec_replay_protect,
                                  ssid->macsec_replay_window, ssid->macsec_port,
-                                 ssid->mka_priority, wpa_s->ifname,
-                                 wpa_s->own_addr);
+                                 ssid->mka_priority, ssid->macsec_csindex,
+                                 wpa_s->ifname, wpa_s->own_addr);
        /* ieee802_1x_kay_init() frees kay_ctx on failure */
        if (res == NULL)
                return -1;