tests: Use check_sae_capab() where possible

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py
index 00b1635db07289c32f2bc566d33950b38c2cf1ca..7e5e2fb3e84d5a6795d38bcf13c39faf481a0ec8 100644 (file)
--- a/tests/hwsim/test_ap_ft.py
+++ b/tests/hwsim/test_ap_ft.py
@@ -1027,8 +1027,7 @@ def start_ft_sae(dev, apdev, wpa_ptk_rekey=None, sae_pwe=None,
                  no_beacon_rsnxe2=False, ext_key_id=False,
                  skip_prune_assoc=False, ft_rsnxe_used=False,
                  sae_transition=False):
-    if "SAE" not in dev.get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev)
     ssid = "test-ft"
     passphrase = "12345678"
 
@@ -1302,8 +1301,7 @@ def test_ap_ft_sae_rsnxe_used_mismatch2(dev, apdev):
 
 def test_ap_ft_sae_pw_id(dev, apdev):
     """FT-SAE with Password Identifier"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "test-ft"
 
     params = ft_params1(ssid=ssid)
@@ -1323,8 +1321,7 @@ def test_ap_ft_sae_pw_id(dev, apdev):
 
 def test_ap_ft_sae_with_both_akms(dev, apdev):
     """SAE + FT-SAE configuration"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "test-ft"
     passphrase = "12345678"
 
@@ -1344,8 +1341,7 @@ def test_ap_ft_sae_with_both_akms(dev, apdev):
 
 def test_ap_ft_sae_pmksa_caching(dev, apdev):
     """WPA2-FT-SAE AP and PMKSA caching for initial mobility domain association"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "test-ft"
     passphrase = "12345678"
 
@@ -1365,8 +1361,7 @@ def test_ap_ft_sae_pmksa_caching(dev, apdev):
 
 def test_ap_ft_sae_pmksa_caching_pwe(dev, apdev):
     """WPA2-FT-SAE AP and PMKSA caching for initial mobility domain association (STA PWE both)"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "test-ft"
     passphrase = "12345678"
 
@@ -1391,8 +1386,7 @@ def test_ap_ft_sae_pmksa_caching_pwe(dev, apdev):
 
 def test_ap_ft_sae_pmksa_caching_h2e(dev, apdev):
     """WPA2-FT-SAE AP and PMKSA caching for initial mobility domain association (H2E)"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "test-ft"
     passphrase = "12345678"
 

diff --git a/tests/hwsim/test_ap_vlan.py b/tests/hwsim/test_ap_vlan.py
index e4bfd68693b2a56dab87bd5a7f02b036dc8cf1a0..e50f76252aed27d68043591469248abe0234760f 100644 (file)
--- a/tests/hwsim/test_ap_vlan.py
+++ b/tests/hwsim/test_ap_vlan.py
@@ -20,7 +20,7 @@ except ImportError:
 
 import hwsim_utils
 import hostapd
-from utils import iface_is_in_bridge, HwsimSkip, alloc_fail
+from utils import *
 import os
 from tshark import run_tshark
 
@@ -785,8 +785,7 @@ def test_ap_vlan_psk(dev, apdev, params):
 def test_ap_vlan_sae(dev, apdev, params):
     """AP VLAN based on SAE Password Identifier"""
     for i in range(3):
-        if "SAE" not in dev[i].get_capability("auth_alg"):
-            raise HwsimSkip("SAE not supported")
+        check_sae_capab(dev[i])
     params = hostapd.wpa2_params(ssid="test-sae-vlan")
     params['wpa_key_mgmt'] = 'SAE'
     params['sae_password'] = ['pw1|vlanid=1|id=id1',

diff --git a/tests/hwsim/test_dpp.py b/tests/hwsim/test_dpp.py
index 12b4becf051a7213c36ef4b71478f4d609a7d7f6..7e3b3542437c91b49a115634d7aa293e5b6b4808 100644 (file)
--- a/tests/hwsim/test_dpp.py
+++ b/tests/hwsim/test_dpp.py
@@ -1612,8 +1612,7 @@ def test_dpp_and_sae_akm(dev, apdev):
     """DPP and SAE AKMs"""
     check_dpp_capab(dev[0])
     check_dpp_capab(dev[1])
-    if "SAE" not in dev[1].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[1])
 
     params = {"ssid": "dpp+sae",
               "wpa": "2",
@@ -6446,8 +6445,7 @@ def test_dpp_pfs_connect_cmd_ap_2_sae(dev, apdev):
     wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
     wpas.interface_add("wlan5", drv_params="force_connect_cmd=1")
     check_dpp_capab(wpas)
-    if "SAE" not in wpas.get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(wpas)
     hapd = start_dpp_pfs_ap(apdev[0], 2, sae=True)
     run_dpp_pfs_sta(wpas, 0, pfs_expected=False, sae=True)
     run_dpp_pfs_sta(wpas, 1, fail=True, sae=True)

diff --git a/tests/hwsim/test_dpp3.py b/tests/hwsim/test_dpp3.py
index d87d6ed4841721973d6bdc9f85b526ff9654d436..1752d009eaa4262fae46c5076bb097839e88a619 100644 (file)
--- a/tests/hwsim/test_dpp3.py
+++ b/tests/hwsim/test_dpp3.py
@@ -11,6 +11,7 @@ import time
 import hostapd
 from wlantest import WlantestCapture
 from test_dpp import check_dpp_capab, run_dpp_auto_connect, wait_auth_success, update_hapd_config
+from utils import *
 
 def test_dpp_network_intro_version(dev, apdev):
     """DPP Network Introduction and protocol version"""
@@ -111,8 +112,7 @@ def test_dpp_tcp_pkex(dev, apdev, params):
         dev[1].request("DPP_CONTROLLER_STOP")
 
 def run_dpp_tcp_pkex_auto_connect_2(dev, apdev, params, status, start_ap=True):
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     dev[0].set("sae_groups", "")
 
     cap_lo = params['prefix'] + ".lo.pcap"

diff --git a/tests/hwsim/test_sigma_dut.py b/tests/hwsim/test_sigma_dut.py
index 615f9172a6ed0050064b45346a53b9fd3ef8b1f5..cccc44f4de9331e0c6a0f609bf172e92a0694b94 100644 (file)
--- a/tests/hwsim/test_sigma_dut.py
+++ b/tests/hwsim/test_sigma_dut.py
@@ -295,8 +295,7 @@ def run_sigma_dut_psk_pmf_cipher(dev, apdev, sigma_cipher, hostapd_cipher,
 
 def test_sigma_dut_sae(dev, apdev):
     """sigma_dut controlled SAE association"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -343,8 +342,7 @@ def test_sigma_dut_sae(dev, apdev):
 
 def test_sigma_dut_sae_groups(dev, apdev):
     """sigma_dut controlled SAE association with group negotiation"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -374,8 +372,7 @@ def test_sigma_dut_sae_groups(dev, apdev):
 
 def test_sigma_dut_sae_pmkid_include(dev, apdev):
     """sigma_dut controlled SAE association with PMKID"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -400,8 +397,7 @@ def test_sigma_dut_sae_pmkid_include(dev, apdev):
 
 def test_sigma_dut_sae_password(dev, apdev):
     """sigma_dut controlled SAE association and long password"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -428,8 +424,7 @@ def test_sigma_dut_sae_password(dev, apdev):
 
 def test_sigma_dut_sae_pw_id(dev, apdev):
     """sigma_dut controlled SAE association with Password Identifier"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -456,8 +451,7 @@ def test_sigma_dut_sae_pw_id(dev, apdev):
 
 def test_sigma_dut_sae_pw_id_pwe_loop(dev, apdev):
     """sigma_dut controlled SAE association with Password Identifier and forced PWE looping"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -500,8 +494,7 @@ def test_sigma_dut_sae_pw_id_ft_over_ds(dev, apdev):
     run_sigma_dut_sae_pw_id_ft(dev, apdev, over_ds=True)
 
 def run_sigma_dut_sae_pw_id_ft(dev, apdev, over_ds=False):
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -966,8 +959,7 @@ def test_sigma_dut_ap_sae(dev, apdev, params):
     """sigma_dut controlled AP with SAE"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -997,8 +989,7 @@ def test_sigma_dut_ap_sae_confirm_immediate(dev, apdev, params):
     """sigma_dut controlled AP with SAE Confirm immediate"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_confirm_immediate.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1021,8 +1012,7 @@ def test_sigma_dut_ap_sae_password(dev, apdev, params):
     """sigma_dut controlled AP with SAE and long password"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_password.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1047,8 +1037,7 @@ def test_sigma_dut_ap_sae_pw_id(dev, apdev, params):
                           "sigma_dut_ap_sae_pw_id.sigma-hostapd")
     conffile = os.path.join(params['logdir'],
                             "sigma_dut_ap_sae_pw_id.sigma-conf")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1083,8 +1072,7 @@ def test_sigma_dut_ap_sae_pw_id_pwe_loop(dev, apdev, params):
                           "sigma_dut_ap_sae_pw_id_pwe_loop.sigma-hostapd")
     conffile = os.path.join(params['logdir'],
                             "sigma_dut_ap_sae_pw_id_pwe_loop.sigma-conf")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1119,8 +1107,7 @@ def test_sigma_dut_ap_sae_pw_id_ft(dev, apdev, params):
                           "sigma_dut_ap_sae_pw_id_ft.sigma-hostapd")
     conffile = os.path.join(params['logdir'],
                             "sigma_dut_ap_sae_pw_id_ft.sigma-conf")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1153,8 +1140,7 @@ def test_sigma_dut_ap_sae_group(dev, apdev, params):
     """sigma_dut controlled AP with SAE and specific group"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_group.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1175,8 +1161,7 @@ def test_sigma_dut_ap_sae_group(dev, apdev, params):
 
 def test_sigma_dut_ap_psk_sae(dev, apdev, params):
     """sigma_dut controlled AP with PSK+SAE"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_psk_sae.sigma-hostapd")
     with HWSimRadio() as (radio, iface):
@@ -1210,8 +1195,7 @@ def test_sigma_dut_ap_psk_sae_ft(dev, apdev, params):
                           "sigma_dut_ap_psk_sae_ft.sigma-hostapd")
     conffile = os.path.join(params['logdir'],
                             "sigma_dut_ap_psk_sae_ft.sigma-conf")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -1947,8 +1931,7 @@ def test_sigma_dut_dpp_qr_init_enrollee_sae(dev, apdev):
     """sigma_dut DPP/QR initiator as Enrollee (SAE)"""
     check_dpp_capab(dev[0])
     check_dpp_capab(dev[1])
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     params = hostapd.wpa2_params(ssid="DPPNET01",
                                  passphrase="ThisIsDppPassphrase")
@@ -4332,8 +4315,7 @@ def no_connect_sae_pwe_sta(dev, ifname, extra=None):
 
 def test_sigma_dut_sae_h2e(dev, apdev):
     """sigma_dut controlled SAE H2E association (AP using loop+H2E)"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     start_sae_pwe_ap(apdev[0], 2)
 
@@ -4352,8 +4334,7 @@ def test_sigma_dut_sae_h2e(dev, apdev):
 
 def test_sigma_dut_sae_h2e_ap_loop(dev, apdev):
     """sigma_dut controlled SAE H2E association (AP using loop-only)"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     start_sae_pwe_ap(apdev[0], 0)
 
@@ -4369,8 +4350,7 @@ def test_sigma_dut_sae_h2e_ap_loop(dev, apdev):
 
 def test_sigma_dut_sae_h2e_ap_h2e(dev, apdev):
     """sigma_dut controlled SAE H2E association (AP using H2E-only)"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     start_sae_pwe_ap(apdev[0], 1)
 
@@ -4388,8 +4368,7 @@ def test_sigma_dut_ap_sae_h2e(dev, apdev, params):
     """sigma_dut controlled AP with SAE H2E"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_h2e.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, sae_h2e=True, hostapd_logdir=logdir)
         try:
@@ -4416,8 +4395,7 @@ def test_sigma_dut_ap_sae_h2e_only(dev, apdev, params):
     """sigma_dut controlled AP with SAE H2E-only"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_h2e.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, sae_h2e=True, hostapd_logdir=logdir)
         try:
@@ -4452,8 +4430,7 @@ def test_sigma_dut_ap_sae_loop_only(dev, apdev, params):
     """sigma_dut controlled AP with SAE looping-only"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_h2e.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, sae_h2e=True, hostapd_logdir=logdir)
         try:
@@ -4486,8 +4463,7 @@ def test_sigma_dut_ap_sae_loop_only(dev, apdev, params):
 
 def test_sigma_dut_sae_h2e_loop_forcing(dev, apdev):
     """sigma_dut controlled SAE H2E misbehavior with looping forced"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ssid = "test-sae"
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
@@ -4515,8 +4491,7 @@ def test_sigma_dut_sae_h2e_loop_forcing(dev, apdev):
 
 def test_sigma_dut_sae_h2e_enabled_group_rejected(dev, apdev):
     """sigma_dut controlled SAE H2E misbehavior with rejected groups"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ssid = "test-sae"
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
@@ -4546,8 +4521,7 @@ def test_sigma_dut_sae_h2e_enabled_group_rejected(dev, apdev):
 
 def test_sigma_dut_sae_h2e_rsnxe_mismatch(dev, apdev):
     """sigma_dut controlled SAE H2E misbehavior with RSNXE"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ssid = "test-sae"
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
@@ -4579,8 +4553,7 @@ def test_sigma_dut_ap_sae_h2e_rsnxe_mismatch(dev, apdev, params):
     """sigma_dut controlled SAE H2E AP misbehavior with RSNXE"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_h2e_rsnxe_mismatch.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, sae_h2e=True, hostapd_logdir=logdir)
         try:
@@ -4613,8 +4586,7 @@ def test_sigma_dut_ap_sae_h2e_group_rejection(dev, apdev, params):
     """sigma_dut controlled AP with SAE H2E-only and group rejection"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_h2e_group_rejection.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, sae_h2e=True, hostapd_logdir=logdir)
         try:
@@ -4641,8 +4613,7 @@ def test_sigma_dut_ap_sae_h2e_anti_clogging(dev, apdev, params):
     """sigma_dut controlled AP with SAE H2E and anti-clogging token"""
     logdir = os.path.join(params['logdir'],
                           "sigma_dut_ap_sae_h2e_anti_clogging.sigma-hostapd")
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, sae_h2e=True, hostapd_logdir=logdir)
         try:
@@ -4856,8 +4827,7 @@ def test_sigma_dut_ap_transition_disable_change(dev, apdev, params):
 
 def test_sigma_dut_ft_rsnxe_used_mismatch(dev, apdev):
     """sigma_dut controlled FT protocol with RSNXE Used mismatch"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -4931,8 +4901,7 @@ def test_sigma_dut_ap_ft_rsnxe_used_mismatch(dev, apdev, params):
     """sigma_dut controlled AP with FT and RSNXE Used mismatch"""
     logdir = params['prefix'] + ".sigma-hostapd"
     conffile = params['prefix'] + ".sigma-conf"
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -4963,8 +4932,7 @@ def test_sigma_dut_ap_ft_rsnxe_used_mismatch(dev, apdev, params):
 
 def test_sigma_dut_ocv(dev, apdev):
     """sigma_dut controlled STA using OCV"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -5010,8 +4978,7 @@ def test_sigma_dut_ap_ocv(dev, apdev, params):
     """sigma_dut controlled AP using OCV"""
     logdir = params['prefix'] + ".sigma-hostapd"
     conffile = params['prefix'] + ".sigma-conf"
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -5050,8 +5017,7 @@ def test_sigma_dut_ap_ocv(dev, apdev, params):
 
 def test_sigma_dut_gtk_rekey(dev, apdev):
     """sigma_dut controlled STA requesting GTK rekeying"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -5085,8 +5051,7 @@ def test_sigma_dut_gtk_rekey(dev, apdev):
 def test_sigma_dut_ap_gtk_rekey(dev, apdev, params):
     """sigma_dut controlled AP and requested GTK rekeying"""
     logdir = params['prefix'] + ".sigma-hostapd"
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     with HWSimRadio() as (radio, iface):
         sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
         try:
@@ -5112,8 +5077,7 @@ def test_sigma_dut_ap_gtk_rekey(dev, apdev, params):
 
 def test_sigma_dut_sae_pk(dev, apdev):
     """sigma_dut controlled STA using SAE-PK"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)
@@ -5199,8 +5163,7 @@ def test_sigma_dut_ap_sae_pk(dev, apdev, params):
     """sigma_dut controlled AP using SAE-PK"""
     logdir = params['prefix'] + ".sigma-hostapd"
     conffile = params['prefix'] + ".sigma-conf"
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     tests = [("SAEPK-4.7.1.1", "ya3o-zvm2-r4so", "saepk1.pem",
               "faa1ef5094bdb4cb2836332ca2c09839", False),
              ("SAEPK-4.7.1.2", "xcc2-qwru-yg23", "saepk1.pem",
@@ -5259,8 +5222,7 @@ def test_sigma_dut_ap_sae_pk_misbehavior(dev, apdev, params):
     """sigma_dut controlled AP using SAE-PK misbehavior"""
     logdir = params['prefix'] + ".sigma-hostapd"
     conffile = params['prefix'] + ".sigma-conf"
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "SAEPK-4.7.1.1"
     pw = "rmj3-ya7b-42k4"
     keypair = "saepk1.pem"
@@ -5308,8 +5270,7 @@ def test_sigma_dut_ap_sae_pk_mixed(dev, apdev, params):
     """sigma_dut controlled AP using SAE-PK(disabled) and PSK"""
     logdir = params['prefix'] + ".sigma-hostapd"
     conffile = params['prefix'] + ".sigma-conf"
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
     ssid = "SAEPK-5.7.3"
     pw = "4322-ufus-4bhm"
     keypair = "saepk1.pem"
@@ -5366,8 +5327,7 @@ def test_sigma_dut_client_privacy(dev, apdev, params):
 
 def test_sigma_dut_wpa3_inject_frame(dev, apdev):
     """sigma_dut and WPA3 frame inject"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
 
     ifname = dev[0].ifname
     sigma = start_sigma_dut(ifname)

diff --git a/tests/hwsim/test_wpas_ap.py b/tests/hwsim/test_wpas_ap.py
index fb70cd3bb49f194a3bdad58e3c4cd47e55e659ea..458213d3e607fe3af4396b0f5ab3d7f692b99290 100644 (file)
--- a/tests/hwsim/test_wpas_ap.py
+++ b/tests/hwsim/test_wpas_ap.py
@@ -785,10 +785,8 @@ def test_wpas_ap_sae_pwe_1(dev):
         dev[1].set("sae_pwe", "0")
 
 def run_wpas_ap_sae(dev, sae_password, sae_password_id=False):
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
-    if "SAE" not in dev[1].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
+    check_sae_capab(dev[1])
     dev[0].request("SET sae_groups ")
     id = dev[0].add_network()
     dev[0].set_network(id, "mode", "2")
@@ -855,10 +853,8 @@ def test_wpas_ap_sae(dev):
 
 def test_wpas_ap_sae_and_psk_transition_disable(dev):
     """wpa_supplicant AP mode - SAE+PSK transition disable indication"""
-    if "SAE" not in dev[0].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
-    if "SAE" not in dev[1].get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    check_sae_capab(dev[0])
+    check_sae_capab(dev[1])
     dev[0].set("sae_groups", "")
     id = dev[0].add_network()
     dev[0].set_network(id, "mode", "2")

diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py
index 71825dc65bbf9d0662a34695e81375c5fdabd20c..4b9209e595200cff9235624623e46569ee847ebf 100644 (file)
--- a/tests/hwsim/test_wpas_mesh.py
+++ b/tests/hwsim/test_wpas_mesh.py
@@ -24,8 +24,8 @@ from hwsim_utils import set_group_map
 def check_mesh_support(dev, secure=False):
     if "MESH" not in dev.get_capability("modes"):
         raise HwsimSkip("Driver does not support mesh")
-    if secure and "SAE" not in dev.get_capability("auth_alg"):
-        raise HwsimSkip("SAE not supported")
+    if secure:
+        check_sae_capab(dev)
 
 def check_mesh_scan(dev, params, other_started=False, beacon_int=0):
     if not other_started: