jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Interworking: Allow FT to be used for connection

Browse source 
This extends Interworking network selection to enable FT-EAP as an
optional key_mgmt value to allow FT to be used instead of hardcoding
WPA2-Enterprise without FT.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-05-10 16:15:20 +03:00
parent 81ed4991ae
commit 270c9a43e6
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wpa_supplicant/interworking.c
View file

@ -27,6 +27,7 @@
#include "bss.h" #include "bss.h"
#include "scan.h" #include "scan.h"
#include "notify.h" #include "notify.h"
#include "driver_i.h"
#include "gas_query.h" #include "gas_query.h"
#include "hs20_supplicant.h" #include "hs20_supplicant.h"
#include "interworking.h" #include "interworking.h"
@ -875,9 +876,23 @@ static void remove_duplicate_network(struct wpa_supplicant *wpa_s,
static int interworking_set_hs20_params(struct wpa_supplicant *wpa_s, static int interworking_set_hs20_params(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid) struct wpa_ssid *ssid)
{ {
if (wpa_config_set(ssid, "key_mgmt", const char *key_mgmt = NULL;
wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ? #ifdef CONFIG_IEEE80211R
"WPA-EAP WPA-EAP-SHA256" : "WPA-EAP", 0) < 0) int res;
struct wpa_driver_capa capa;
res = wpa_drv_get_capa(wpa_s, &capa);
if (res == 0 && capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_FT) {
key_mgmt = wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ?
"WPA-EAP WPA-EAP-SHA256 FT-EAP" :
"WPA-EAP FT-EAP";
}
#endif /* CONFIG_IEEE80211R */
if (!key_mgmt)
key_mgmt = wpa_s->conf->pmf != NO_MGMT_FRAME_PROTECTION ?
"WPA-EAP WPA-EAP-SHA256" : "WPA-EAP";
if (wpa_config_set(ssid, "key_mgmt", key_mgmt, 0) < 0)
return -1; return -1;
if (wpa_config_set(ssid, "proto", "RSN", 0) < 0) if (wpa_config_set(ssid, "proto", "RSN", 0) < 0)
return -1; return -1;