From 1f044b8f4596925c88d61d0639a3eb8a4d571474 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Wed, 5 Oct 2022 15:46:29 -0700 Subject: [PATCH] auto-t: remove rekey timeouts from autotests Any autotest which rekeys will do so explicitly. There is no need to potentially introduce an unexpected rekey. --- autotests/testFILS/radius.conf | 2 -- autotests/testFILS/ssidFILS-256.conf | 2 -- autotests/testFILS/ssidFILS-384.conf | 2 -- autotests/testFT-8021x-roam/ft-eap-ccmp-1.conf | 2 -- autotests/testFT-8021x-roam/ft-eap-ccmp-2.conf | 2 -- autotests/testFT-FILS/ft-eap-ccmp-1.conf | 2 -- autotests/testFT-FILS/ft-eap-ccmp-2.conf | 2 -- autotests/testFT-FILS/radius.conf | 2 -- autotests/testPSK-roam/ft-psk-ccmp-1.conf | 2 -- autotests/testPSK-roam/ft-psk-ccmp-2.conf | 2 -- autotests/testPreauth-roam/eaptls-preauth-1.conf | 2 -- autotests/testPreauth-roam/eaptls-preauth-2.conf | 2 -- autotests/testSAE-roam/ft-psk-3.conf | 2 -- autotests/testSAE-roam/ft-sae-1.conf | 2 -- autotests/testSAE-roam/ft-sae-2.conf | 2 -- 15 files changed, 30 deletions(-) diff --git a/autotests/testFILS/radius.conf b/autotests/testFILS/radius.conf index 1ec52e46..f8f2b596 100644 --- a/autotests/testFILS/radius.conf +++ b/autotests/testFILS/radius.conf @@ -11,5 +11,3 @@ fils_realm=example.com disable_pmksa_caching=1 pwd_group=19 -wpa_group_rekey=30 -wpa_ptk_rekey=30 diff --git a/autotests/testFILS/ssidFILS-256.conf b/autotests/testFILS/ssidFILS-256.conf index 66d4bfb5..1ee9fc8f 100644 --- a/autotests/testFILS/ssidFILS-256.conf +++ b/autotests/testFILS/ssidFILS-256.conf @@ -17,6 +17,4 @@ nas_identifier=nas.w1.fi fils_realm=example.com disable_pmksa_caching=1 -wpa_group_rekey=30 -wpa_ptk_rekey=30 ocv=1 diff --git a/autotests/testFILS/ssidFILS-384.conf b/autotests/testFILS/ssidFILS-384.conf index 5254d5f8..57ebe6e5 100644 --- a/autotests/testFILS/ssidFILS-384.conf +++ b/autotests/testFILS/ssidFILS-384.conf @@ -17,6 +17,4 @@ nas_identifier=nas.w1.fi fils_realm=example.com disable_pmksa_caching=1 -wpa_group_rekey=30 -wpa_ptk_rekey=30 ocv=1 diff --git a/autotests/testFT-8021x-roam/ft-eap-ccmp-1.conf b/autotests/testFT-8021x-roam/ft-eap-ccmp-1.conf index a7f220d9..5a04668f 100644 --- a/autotests/testFT-8021x-roam/ft-eap-ccmp-1.conf +++ b/autotests/testFT-8021x-roam/ft-eap-ccmp-1.conf @@ -17,8 +17,6 @@ eap_user_file=/tmp/secrets/eap-user.text ca_cert=/tmp/certs/cert-ca.pem server_cert=/tmp/certs/cert-server.pem private_key=/tmp/certs/cert-server-key.pem -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 rsn_preauth=1 disable_pmksa_caching=0 diff --git a/autotests/testFT-8021x-roam/ft-eap-ccmp-2.conf b/autotests/testFT-8021x-roam/ft-eap-ccmp-2.conf index 289d7a17..98754fd1 100644 --- a/autotests/testFT-8021x-roam/ft-eap-ccmp-2.conf +++ b/autotests/testFT-8021x-roam/ft-eap-ccmp-2.conf @@ -17,8 +17,6 @@ eap_user_file=/tmp/secrets/eap-user.text ca_cert=/tmp/certs/cert-ca.pem server_cert=/tmp/certs/cert-server.pem private_key=/tmp/certs/cert-server-key.pem -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 rsn_preauth=1 disable_pmksa_caching=0 diff --git a/autotests/testFT-FILS/ft-eap-ccmp-1.conf b/autotests/testFT-FILS/ft-eap-ccmp-1.conf index 1853ff70..4dbbfb50 100644 --- a/autotests/testFT-FILS/ft-eap-ccmp-1.conf +++ b/autotests/testFT-FILS/ft-eap-ccmp-1.conf @@ -15,8 +15,6 @@ ieee8021x=1 fils_realm=example.com -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 rsn_preauth=1 disable_pmksa_caching=1 diff --git a/autotests/testFT-FILS/ft-eap-ccmp-2.conf b/autotests/testFT-FILS/ft-eap-ccmp-2.conf index 585f1ca1..5f341bcd 100644 --- a/autotests/testFT-FILS/ft-eap-ccmp-2.conf +++ b/autotests/testFT-FILS/ft-eap-ccmp-2.conf @@ -15,8 +15,6 @@ ieee8021x=1 fils_realm=example.com -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 rsn_preauth=1 disable_pmksa_caching=1 diff --git a/autotests/testFT-FILS/radius.conf b/autotests/testFT-FILS/radius.conf index 1ec52e46..f8f2b596 100644 --- a/autotests/testFT-FILS/radius.conf +++ b/autotests/testFT-FILS/radius.conf @@ -11,5 +11,3 @@ fils_realm=example.com disable_pmksa_caching=1 pwd_group=19 -wpa_group_rekey=30 -wpa_ptk_rekey=30 diff --git a/autotests/testPSK-roam/ft-psk-ccmp-1.conf b/autotests/testPSK-roam/ft-psk-ccmp-1.conf index c012b4ef..4a2ceba5 100644 --- a/autotests/testPSK-roam/ft-psk-ccmp-1.conf +++ b/autotests/testPSK-roam/ft-psk-ccmp-1.conf @@ -13,8 +13,6 @@ wpa=2 wpa_key_mgmt=FT-PSK wpa_pairwise=CCMP wpa_passphrase=EasilyGuessedPassword -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 rsn_preauth=1 rsn_preauth_interfaces=lo diff --git a/autotests/testPSK-roam/ft-psk-ccmp-2.conf b/autotests/testPSK-roam/ft-psk-ccmp-2.conf index 84875fdc..a42e175d 100644 --- a/autotests/testPSK-roam/ft-psk-ccmp-2.conf +++ b/autotests/testPSK-roam/ft-psk-ccmp-2.conf @@ -13,8 +13,6 @@ wpa=2 wpa_key_mgmt=FT-PSK wpa_pairwise=CCMP wpa_passphrase=EasilyGuessedPassword -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 rsn_preauth=1 rsn_preauth_interfaces=lo diff --git a/autotests/testPreauth-roam/eaptls-preauth-1.conf b/autotests/testPreauth-roam/eaptls-preauth-1.conf index dac086e6..5b4c9d6f 100644 --- a/autotests/testPreauth-roam/eaptls-preauth-1.conf +++ b/autotests/testPreauth-roam/eaptls-preauth-1.conf @@ -7,8 +7,6 @@ wpa=2 wpa_key_mgmt=WPA-EAP wpa_pairwise=CCMP ieee8021x=1 -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 # Run the RADIUS server in the BSS 0 hostapd only, listen for BSS 1 connections diff --git a/autotests/testPreauth-roam/eaptls-preauth-2.conf b/autotests/testPreauth-roam/eaptls-preauth-2.conf index 6d3a18e7..edb97fe0 100644 --- a/autotests/testPreauth-roam/eaptls-preauth-2.conf +++ b/autotests/testPreauth-roam/eaptls-preauth-2.conf @@ -7,8 +7,6 @@ wpa=2 wpa_key_mgmt=WPA-EAP wpa_pairwise=CCMP ieee8021x=1 -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=1 # For EAP connect to the RADIUS server in the BSS 0 diff --git a/autotests/testSAE-roam/ft-psk-3.conf b/autotests/testSAE-roam/ft-psk-3.conf index 8918cf9e..705f2e6c 100644 --- a/autotests/testSAE-roam/ft-psk-3.conf +++ b/autotests/testSAE-roam/ft-psk-3.conf @@ -13,8 +13,6 @@ wpa=2 wpa_key_mgmt=FT-PSK wpa_pairwise=CCMP wpa_passphrase=EasilyGuessedPassword -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=2 disable_pmksa_caching=0 # Allow PMK cache to be shared opportunistically among configured interfaces diff --git a/autotests/testSAE-roam/ft-sae-1.conf b/autotests/testSAE-roam/ft-sae-1.conf index aa40494a..bccac375 100644 --- a/autotests/testSAE-roam/ft-sae-1.conf +++ b/autotests/testSAE-roam/ft-sae-1.conf @@ -13,8 +13,6 @@ wpa=2 wpa_key_mgmt=FT-SAE SAE sae_password=EasilyGuessedPassword|mac=ff:ff:ff:ff:ff:ff wpa_pairwise=CCMP -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=2 disable_pmksa_caching=0 # Allow PMK cache to be shared opportunistically among configured interfaces diff --git a/autotests/testSAE-roam/ft-sae-2.conf b/autotests/testSAE-roam/ft-sae-2.conf index 5bff6c9d..bb7ecff4 100644 --- a/autotests/testSAE-roam/ft-sae-2.conf +++ b/autotests/testSAE-roam/ft-sae-2.conf @@ -13,8 +13,6 @@ wpa=2 wpa_key_mgmt=FT-SAE SAE sae_password=EasilyGuessedPassword|mac=ff:ff:ff:ff:ff:ff wpa_pairwise=CCMP -wpa_ptk_rekey=30 -wpa_group_rekey=80 ieee80211w=2 disable_pmksa_caching=0 # Allow PMK cache to be shared opportunistically among configured interfaces