Make driver capabilities for AKM suites available within wpa_supplicant

In addition, add some of the previously missed AKM suites from the
default capabilities.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
index 240d01d3d6e25f71ccf8987af8474b2c26a20e72..26c1f41406d2ee291cc07e559251acf866ce4de9 100644 (file)
--- a/src/drivers/driver_nl80211_capa.c
+++ b/src/drivers/driver_nl80211_capa.c
@@ -1476,6 +1476,7 @@ int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv)
                        WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
                        WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
                        WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK |
+                       WPA_DRIVER_CAPA_KEY_MGMT_PSK_SHA256 |
                        WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B |
                        WPA_DRIVER_CAPA_KEY_MGMT_OWE |
                        WPA_DRIVER_CAPA_KEY_MGMT_DPP;
@@ -1491,6 +1492,7 @@ int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv)
                                WPA_DRIVER_CAPA_KEY_MGMT_FILS_SHA384 |
                                WPA_DRIVER_CAPA_KEY_MGMT_FT_FILS_SHA256 |
                                WPA_DRIVER_CAPA_KEY_MGMT_FT_FILS_SHA384 |
+                               WPA_DRIVER_CAPA_KEY_MGMT_SAE_EXT_KEY |
                                WPA_DRIVER_CAPA_KEY_MGMT_SAE;
                else if (drv->capa.flags & WPA_DRIVER_FLAGS_FILS_SK_OFFLOAD)
                        drv->capa.key_mgmt |=

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index de8785a3c6ff350e613355a032186f92ba74b274..c2797756017015733fa0fa4695d7ddd7c6963b03 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -7363,6 +7363,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
                wpa_s->drv_flags = capa.flags;
                wpa_s->drv_flags2 = capa.flags2;
                wpa_s->drv_enc = capa.enc;
+               wpa_s->drv_key_mgmt = capa.key_mgmt;
                wpa_s->drv_rrm_flags = capa.rrm_flags;
                wpa_s->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
                wpa_s->probe_resp_offloads = capa.probe_resp_offloads;

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 110a8648c81f181cfde702fb6e57a75ea8ced6cb..e92f6b147402ba8391237a7d8005f4d07b26f692 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -920,6 +920,7 @@ struct wpa_supplicant {
        u64 drv_flags;
        u64 drv_flags2;
        unsigned int drv_enc;
+       unsigned int drv_key_mgmt;
        unsigned int drv_rrm_flags;
        unsigned int drv_max_acl_mac_addrs;