]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
OWE: Add driver capability flag for OWE AKM
authorJouni Malinen <j@w1.fi>
Sat, 11 Mar 2017 22:38:04 +0000 (00:38 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 12 Mar 2017 17:24:11 +0000 (19:24 +0200)
Signed-off-by: Jouni Malinen <j@w1.fi>
src/drivers/driver.h
src/drivers/driver_nl80211_capa.c
wpa_supplicant/ctrl_iface.c

index 3dc4827a5e36fe5fe06684870a668edafaaa58f9..fc2593e3e686a11967d41041770e97b99c5d23f0 100644 (file)
@@ -1330,6 +1330,7 @@ struct wpa_driver_capa {
 #define WPA_DRIVER_CAPA_KEY_MGMT_WAPI_PSK      0x00000080
 #define WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B       0x00000100
 #define WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B_192   0x00000200
+#define WPA_DRIVER_CAPA_KEY_MGMT_OWE           0x00000400
        /** Bitfield of supported key management suites */
        unsigned int key_mgmt;
 
index 4053c2109fc8975134205e58988f43512789623d..f67ad21cc55b8ee1b01f2277200eeeaee08dc540 100644 (file)
@@ -1129,7 +1129,8 @@ int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv)
                WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
                WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK |
                WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B |
-               WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B_192;
+               WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B_192 |
+               WPA_DRIVER_CAPA_KEY_MGMT_OWE;
        drv->capa.auth = WPA_DRIVER_AUTH_OPEN |
                WPA_DRIVER_AUTH_SHARED |
                WPA_DRIVER_AUTH_LEAP;
index a9839649991ffe7ae046bbfe1e7dee3b84fa35d0..cadcd10950dcc1159fe2cafc0126fdc23ad1be3e 100644 (file)
@@ -3805,6 +3805,14 @@ static int ctrl_iface_get_capability_key_mgmt(int res, char *strict,
                pos += ret;
        }
 #endif /* CONFIG_SUITEB192 */
+#ifdef CONFIG_OWE
+       if (capa->key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_OWE) {
+               ret = os_snprintf(pos, end - pos, " OWE");
+               if (os_snprintf_error(end - pos, ret))
+                       return pos - buf;
+               pos += ret;
+       }
+#endif /* CONFIG_OWE */
 
        return pos - buf;
 }