DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: roaming_consortium_selection

Browse source 
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2018-04-17 17:14:47 +03:00 • committed by Jouni Malinen
parent 6311547e7b
commit ad5704631a
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/hwsim/test_ap_hs20.py
View file

@ -1018,7 +1018,9 @@ def test_ap_hs20_roaming_consortiums_match(dev, apdev):
hostapd.add_ap(apdev[0], params) hostapd.add_ap(apdev[0], params)
dev[0].hs20_enable() dev[0].hs20_enable()
for consortium in [ "112233", "ffffff,1020304050,eeeeee" ]: tests = [ ("112233", "112233"),
("ffffff,1020304050,eeeeee", "1020304050") ]
for consortium,selected in tests:
id = dev[0].add_cred_values({ 'username': "user", id = dev[0].add_cred_values({ 'username': "user",
'password': "password", 'password': "password",
'domain': "my.home.example.com", 'domain': "my.home.example.com",
@ -1028,6 +1030,11 @@ def test_ap_hs20_roaming_consortiums_match(dev, apdev):
interworking_select(dev[0], bssid, "roaming", freq="2412") interworking_select(dev[0], bssid, "roaming", freq="2412")
interworking_connect(dev[0], bssid, "PEAP") interworking_connect(dev[0], bssid, "PEAP")
check_sp_type(dev[0], "roaming") check_sp_type(dev[0], "roaming")
network_id = dev[0].get_status_field("id")
sel = dev[0].get_network(network_id, "roaming_consortium_selection")
if sel != selected:
raise Exception("Unexpected roaming_consortium_selection value: " +
sel)
dev[0].request("INTERWORKING_SELECT auto freq=2412") dev[0].request("INTERWORKING_SELECT auto freq=2412")
ev = dev[0].wait_event(["INTERWORKING-ALREADY-CONNECTED"], timeout=15) ev = dev[0].wait_event(["INTERWORKING-ALREADY-CONNECTED"], timeout=15)
if ev is None: if ev is None:
@ -3683,9 +3690,14 @@ def test_ap_hs20_external_selection(dev, apdev):
dev[0].connect("test-hs20", proto="RSN", key_mgmt="WPA-EAP", eap="TTLS", dev[0].connect("test-hs20", proto="RSN", key_mgmt="WPA-EAP", eap="TTLS",
identity="hs20-test", password="password", identity="hs20-test", password="password",
ca_cert="auth_serv/ca.pem", phase2="auth=MSCHAPV2", ca_cert="auth_serv/ca.pem", phase2="auth=MSCHAPV2",
scan_freq="2412", update_identifier="54321") scan_freq="2412", update_identifier="54321",
roaming_consortium_selection="1020304050")
if dev[0].get_status_field("hs20") != "2": if dev[0].get_status_field("hs20") != "2":
raise Exception("Unexpected hs20 indication") raise Exception("Unexpected hs20 indication")
network_id = dev[0].get_status_field("id")
sel = dev[0].get_network(network_id, "roaming_consortium_selection")
if sel != "1020304050":
raise Exception("Unexpected roaming_consortium_selection value: " + sel)
def test_ap_hs20_random_mac_addr(dev, apdev): def test_ap_hs20_random_mac_addr(dev, apdev):
"""Hotspot 2.0 connection with random MAC address""" """Hotspot 2.0 connection with random MAC address"""

3
tests/hwsim/wpasupplicant.py
View file

@ -1029,7 +1029,8 @@ class WpaSupplicant:
"engine", "fils_dh_group", "bssid_hint", "engine", "fils_dh_group", "bssid_hint",
"dpp_csign", "dpp_csign_expiry", "dpp_csign", "dpp_csign_expiry",
"dpp_netaccesskey", "dpp_netaccesskey_expiry", "dpp_netaccesskey", "dpp_netaccesskey_expiry",
"group_mgmt", "owe_group" ] "group_mgmt", "owe_group",
"roaming_consortium_selection" ]
for field in not_quoted: for field in not_quoted:
if field in kwargs and kwargs[field]: if field in kwargs and kwargs[field]:
self.set_network(id, field, kwargs[field]) self.set_network(id, field, kwargs[field])