drivers: Add separate driver flags for 802.1X and PSK 4-way HS offloads

Allow drivers to indicate support for offloading 4-way handshake for
either IEEE 802.1X (WPA2-Enterprise; EAP) and/or WPA/WPA2-PSK
(WPA2-Personal) by splitting the WPA_DRIVER_FLAGS_4WAY_HANDSHAKE flag
into two separate flags.

Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 380e25272fd994b1fe6e4e1afd853ba1190d47ff..23423d92e898d28de6c09c68df9b267db0615521 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -931,10 +931,10 @@ struct wpa_driver_associate_params {
         * passphrase - RSN passphrase for PSK
         *
         * This value is made available only for WPA/WPA2-Personal (PSK) and
-        * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE. This is
-        * the 8..63 character ASCII passphrase, if available. Please note that
-        * this can be %NULL if passphrase was not used to generate the PSK. In
-        * that case, the psk field must be used to fetch the PSK.
+        * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK. This
+        * is the 8..63 character ASCII passphrase, if available. Please note
+        * that this can be %NULL if passphrase was not used to generate the
+        * PSK. In that case, the psk field must be used to fetch the PSK.
         */
        const char *passphrase;
 
@@ -942,9 +942,9 @@ struct wpa_driver_associate_params {
         * psk - RSN PSK (alternative for passphrase for PSK)
         *
         * This value is made available only for WPA/WPA2-Personal (PSK) and
-        * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE. This is
-        * the 32-octet (256-bit) PSK, if available. The driver wrapper should
-        * be prepared to handle %NULL value as an error.
+        * only for drivers that set WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK. This
+        * is the 32-octet (256-bit) PSK, if available. The driver wrapper
+        * should be prepared to handle %NULL value as an error.
         */
        const u8 *psk;
 
@@ -1492,7 +1492,7 @@ struct wpa_driver_capa {
 #define WPA_DRIVER_FLAGS_DFS_OFFLOAD                   0x00000004
 /** Driver takes care of RSN 4-way handshake internally; PMK is configured with
  * struct wpa_driver_ops::set_key using alg = WPA_ALG_PMK */
-#define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE 0x00000008
+#define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X          0x00000008
 /** Driver is for a wired Ethernet interface */
 #define WPA_DRIVER_FLAGS_WIRED         0x00000010
 /** Driver provides separate commands for authentication and association (SME in
@@ -1616,6 +1616,8 @@ struct wpa_driver_capa {
 #define WPA_DRIVER_FLAGS_SELF_MANAGED_REGULATORY       0x0080000000000000ULL
 /** Driver supports FTM responder functionality */
 #define WPA_DRIVER_FLAGS_FTM_RESPONDER         0x0100000000000000ULL
+/** Driver support 4-way handshake offload for WPA-Personal */
+#define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK    0x0200000000000000ULL
        u64 flags;
 
 #define FULL_AP_CLIENT_STATE_SUPP(drv_flags) \

diff --git a/src/drivers/driver_common.c b/src/drivers/driver_common.c
index 1b92e8605c52e865b46682f3b620daf225d298a6..e55e6cd2b795a2d9716ec85aa4bceea8c9e1b425 100644 (file)
--- a/src/drivers/driver_common.c
+++ b/src/drivers/driver_common.c
@@ -253,7 +253,8 @@ const char * driver_flag_to_string(u64 flag)
        DF2S(DRIVER_IE);
        DF2S(SET_KEYS_AFTER_ASSOC);
        DF2S(DFS_OFFLOAD);
-       DF2S(4WAY_HANDSHAKE);
+       DF2S(4WAY_HANDSHAKE_PSK);
+       DF2S(4WAY_HANDSHAKE_8021X);
        DF2S(WIRED);
        DF2S(SME);
        DF2S(AP);

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 4cf2bdae2805ee5d40b45c94d164f4c5ee30a48e..5081b5b047bea65f47a6306d3f7344d1a940432c 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -3031,7 +3031,7 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
 #endif /* CONFIG_DRIVER_NL80211_QCA */
 
        if (alg == WPA_ALG_PMK &&
-           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
+           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X))
                return nl80211_set_pmk(drv, key, key_len, addr);
 
        if (alg == WPA_ALG_NONE) {
@@ -5570,7 +5570,7 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv,
 
        /* Add PSK in case of 4-way handshake offload */
        if (params->psk &&
-           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE)) {
+           (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK)) {
                wpa_hexdump_key(MSG_DEBUG, "  * PSK", params->psk, 32);
                if (nla_put(msg, NL80211_ATTR_PMK, 32, params->psk))
                        return -1;

diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
index 084db0bd11b8d895d528263f81b1d490f7fe6eaf..37eeb5e6686d361810f5c7142c2d9b6168c9749d 100644 (file)
--- a/src/drivers/driver_nl80211_capa.c
+++ b/src/drivers/driver_nl80211_capa.c
@@ -403,10 +403,11 @@ static void wiphy_info_ext_feature_flags(struct wiphy_info_data *info,
                capa->flags |= WPA_DRIVER_FLAGS_FILS_SK_OFFLOAD;
 
        if (ext_feature_isset(ext_features, len,
-                             NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK) &&
-           ext_feature_isset(ext_features, len,
+                             NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK))
+               capa->flags |= WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK;
+       if (ext_feature_isset(ext_features, len,
                              NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X))
-               capa->flags |= WPA_DRIVER_FLAGS_4WAY_HANDSHAKE;
+               capa->flags |= WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X;
 
        if (ext_feature_isset(ext_features, len,
                              NL80211_EXT_FEATURE_MFP_OPTIONAL))

diff --git a/src/drivers/driver_openbsd.c b/src/drivers/driver_openbsd.c
index e94eda08f6210c127a5329afba2dc99e65b6b91e..c06e75c0f2841123d665919a7b50bf1abf063411 100644 (file)
--- a/src/drivers/driver_openbsd.c
+++ b/src/drivers/driver_openbsd.c
@@ -62,7 +62,8 @@ static int
 wpa_driver_openbsd_get_capa(void *priv, struct wpa_driver_capa *capa)
 {
        os_memset(capa, 0, sizeof(*capa));
-       capa->flags = WPA_DRIVER_FLAGS_4WAY_HANDSHAKE;
+       capa->flags = WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK |
+                     WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X;
        return 0;
 }
 

diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
index 888ea89f39703ddcb249acbfe4a4288faa809a80..f7755cccde27bf9ef42b4e54b2d6824375a97bf5 100644 (file)
--- a/src/drivers/driver_wext.c
+++ b/src/drivers/driver_wext.c
@@ -1647,7 +1647,8 @@ static int wpa_driver_wext_get_range(void *priv)
                if (range->enc_capa & IW_ENC_CAPA_CIPHER_CCMP)
                        drv->capa.enc |= WPA_DRIVER_CAPA_ENC_CCMP;
                if (range->enc_capa & IW_ENC_CAPA_4WAY_HANDSHAKE)
-                       drv->capa.flags |= WPA_DRIVER_FLAGS_4WAY_HANDSHAKE;
+                       drv->capa.flags |= WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK |
+                               WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X;
                drv->capa.auth = WPA_DRIVER_AUTH_OPEN |
                        WPA_DRIVER_AUTH_SHARED |
                        WPA_DRIVER_AUTH_LEAP;
@@ -1678,7 +1679,7 @@ static int wpa_driver_wext_set_psk(struct wpa_driver_wext_data *drv,
 
        wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
 
-       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
+       if (!(drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X))
                return 0;
 
        if (!psk)

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 6fccf00f7f7cf318e7ec83aef88b3abc68b7d4eb..638a9ab038083b5d8ba2ca80e26a4cdf482b81b0 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -2805,7 +2805,7 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
        }
        wpa_supplicant_cancel_scan(wpa_s);
 
-       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
+       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) &&
            wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
                /*
                 * We are done; the driver will take care of RSN 4-way
@@ -2815,7 +2815,7 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
                eapol_sm_notify_portValid(wpa_s->eapol, TRUE);
                eapol_sm_notify_eap_success(wpa_s->eapol, TRUE);
-       } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
+       } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) &&
                   wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
                /*
                 * The driver will take care of RSN 4-way handshake, so we need

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index def89f32064cc69e87f3ed9192cf52de9ad27dda..93630e40898655257e3c5bf999fbbb3e7bb157de 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -3106,7 +3106,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
        }
        params.wep_tx_keyidx = ssid->wep_tx_keyidx;
 
-       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
+       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) &&
            (params.key_mgmt_suite == WPA_KEY_MGMT_PSK ||
             params.key_mgmt_suite == WPA_KEY_MGMT_FT_PSK)) {
                params.passphrase = ssid->passphrase;
@@ -4113,7 +4113,7 @@ void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
        }
 
        if (wpa_s->eapol_received == 0 &&
-           (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) ||
+           (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) ||
             !wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt) ||
             wpa_s->wpa_state != WPA_COMPLETED) &&
            (wpa_s->current_ssid == NULL ||
@@ -4179,7 +4179,7 @@ void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
            eapol_sm_rx_eapol(wpa_s->eapol, src_addr, buf, len) > 0)
                return;
        wpa_drv_poll(wpa_s);
-       if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
+       if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK))
                wpa_sm_rx_eapol(wpa_s->wpa, src_addr, buf, len);
        else if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
                /*

diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index 7cfad9122f6621488b94c6702c8a8afa5403d564..449e04acded8a754adeb5ea903e17f2506d884da 100644 (file)
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -296,7 +296,7 @@ static void wpa_supplicant_eapol_cb(struct eapol_sm *eapol,
        }
 
        if (result != EAPOL_SUPP_RESULT_SUCCESS ||
-           !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
+           !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X))
                return;
 
        if (!wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt))