From de5bf2d1994c53ba1b25ad10f77e17bd209c93ec Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 17 Apr 2020 16:06:25 +0300 Subject: [PATCH] tests: Do not enable TKIP group cipher for FT tests without need Change run_roams() default to CCMP-only and enable TKIP only in the test case that needs this. Signed-off-by: Jouni Malinen --- tests/hwsim/test_ap_ft.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py index dbc02d026..adefab9f9 100644 --- a/tests/hwsim/test_ap_ft.py +++ b/tests/hwsim/test_ap_ft.py @@ -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, 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, force_initial_conn_to_first_ap=False, sha384=False, 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) 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): """WPA2-PSK-FT AP with PMF"""