From 38fa76faf529e25ce9f750007464e0a045d245ca Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 30 Dec 2019 10:09:54 -0800 Subject: [PATCH] auto-t: use stand alone radius server for testFT-FILS-SHA384 This fixes the test with recent hostapd versions --- autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf | 14 ++------------ autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf | 11 ++--------- autotests/testFT-FILS-SHA384/hw.conf | 1 + autotests/testFT-FILS-SHA384/radius.conf | 15 +++++++++++++++ 4 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 autotests/testFT-FILS-SHA384/radius.conf diff --git a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf index ae1d4bfe..61262c69 100644 --- a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf +++ b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-1.conf @@ -12,16 +12,9 @@ wpa=2 wpa_key_mgmt=FT-EAP FILS-SHA384 FT-FILS-SHA384 wpa_pairwise=CCMP ieee8021x=1 -eap_server=0 -eap_server_erp=1 -erp_domain=example.com + fils_realm=example.com -#eap_user_file=/tmp/certs/eap-user-tls.text -eap_user_file=/tmp/pwd.eap_user -pwd_group=19 -#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 @@ -43,9 +36,6 @@ ap_table_expiration_time=36000 ap_table_max_size=10 rrm_neighbor_report=1 -radius_server_clients=/tmp/certs/radius-clients.text -radius_server_auth_port=1812 - auth_server_addr=127.0.0.1 auth_server_port=1812 auth_server_shared_secret=secret diff --git a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf index 0c4deee8..8af73cbc 100644 --- a/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf +++ b/autotests/testFT-FILS-SHA384/ft-eap-ccmp-2.conf @@ -12,16 +12,9 @@ wpa=2 wpa_key_mgmt=FT-FILS-SHA384 wpa_pairwise=CCMP ieee8021x=1 -eap_server=0 -eap_server_erp=1 -erp_domain=example.com + fils_realm=example.com -#eap_user_file=/tmp/certs/eap-user-tls.text -eap_user_file=/tmp/pwd.eap_user -pwd_group=19 -#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 diff --git a/autotests/testFT-FILS-SHA384/hw.conf b/autotests/testFT-FILS-SHA384/hw.conf index 9ea4f110..b5c6757c 100644 --- a/autotests/testFT-FILS-SHA384/hw.conf +++ b/autotests/testFT-FILS-SHA384/hw.conf @@ -7,3 +7,4 @@ iwd_config_dir=/tmp [HOSTAPD] rad0=ft-eap-ccmp-1.conf rad1=ft-eap-ccmp-2.conf +radius_server=radius.conf diff --git a/autotests/testFT-FILS-SHA384/radius.conf b/autotests/testFT-FILS-SHA384/radius.conf new file mode 100644 index 00000000..4fcfdfff --- /dev/null +++ b/autotests/testFT-FILS-SHA384/radius.conf @@ -0,0 +1,15 @@ +driver=none +radius_server_clients=/tmp/certs/radius-clients.text +radius_server_auth_port=1812 +eap_user_file=/tmp/pwd.eap_user +eap_server=0 +eap_server_erp=1 + +erp_send_reauth_start=1 +erp_domain=example.com +fils_realm=example.com +disable_pmksa_caching=1 + +pwd_group=19 +wpa_group_rekey=30 +wpa_ptk_rekey=30