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

tests: Do not enable TKIP group cipher for FT tests without need

Browse source 
Change run_roams() default to CCMP-only and enable TKIP only in the test
case that needs this.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-04-17 16:06:25 +03:00 committed by Jouni Malinen
parent 6b1c590ebb
commit de5bf2d199
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/hwsim/test_ap_ft.py
View file

@ -130,7 +130,7 @@ def ft_params2_r0kh_mismatch(rsn=True, ssid=None, passphrase=None):
def run_roams(dev, apdev, hapd0, hapd1, ssid, passphrase, over_ds=False, def run_roams(dev, apdev, hapd0, hapd1, ssid, passphrase, over_ds=False,
sae=False, eap=False, fail_test=False, roams=1, sae=False, eap=False, fail_test=False, roams=1,
pairwise_cipher="CCMP", group_cipher="TKIP CCMP", ptk_rekey="0", pairwise_cipher="CCMP", group_cipher="CCMP", ptk_rekey="0",
test_connectivity=True, eap_identity="gpsk user", conndev=False, test_connectivity=True, eap_identity="gpsk user", conndev=False,
force_initial_conn_to_first_ap=False, sha384=False, force_initial_conn_to_first_ap=False, sha384=False,
group_mgmt=None, ocv=None, sae_password=None, group_mgmt=None, ocv=None, sae_password=None,
@ -454,7 +454,8 @@ def test_ap_ft_mixed(dev, apdev):
params = ft_params2(rsn=False, ssid=ssid, passphrase=passphrase) params = ft_params2(rsn=False, ssid=ssid, passphrase=passphrase)
hapd1 = hostapd.add_ap(apdev[1], params) hapd1 = hostapd.add_ap(apdev[1], params)
run_roams(dev[0], apdev, hapd, hapd1, ssid, passphrase) run_roams(dev[0], apdev, hapd, hapd1, ssid, passphrase,
group_cipher="TKIP CCMP")
def test_ap_ft_pmf(dev, apdev): def test_ap_ft_pmf(dev, apdev):
"""WPA2-PSK-FT AP with PMF""" """WPA2-PSK-FT AP with PMF"""