DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Allow local disconnect in openssl_cipher_suite_config_wpas

Browse source 
The openssl_ciphers="EXPORT" case may result in locally generated
disconnection event if the OpenSSL version used in the build rejects
export ciphers in default configuration (which is what OpenSSL 1.1.0
will likely do). Don't report a test case failure in such a case.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-07-28 16:38:02 +03:00
parent 3947997dcc
commit 9dd21d5183
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/hwsim/test_ap_eap.py
View file

@ -64,7 +64,7 @@ def read_pem(fname):
def eap_connect(dev, ap, method, identity, def eap_connect(dev, ap, method, identity,
sha256=False, expect_failure=False, local_error_report=False, sha256=False, expect_failure=False, local_error_report=False,
**kwargs): maybe_local_error=False, **kwargs):
hapd = hostapd.Hostapd(ap['ifname']) hapd = hostapd.Hostapd(ap['ifname'])
id = dev.connect("test-wpa2-eap", key_mgmt="WPA-EAP WPA-EAP-SHA256", id = dev.connect("test-wpa2-eap", key_mgmt="WPA-EAP WPA-EAP-SHA256",
eap=method, identity=identity, eap=method, identity=identity,
@ -72,7 +72,8 @@ def eap_connect(dev, ap, method, identity,
**kwargs) **kwargs)
eap_check_auth(dev, method, True, sha256=sha256, eap_check_auth(dev, method, True, sha256=sha256,
expect_failure=expect_failure, expect_failure=expect_failure,
local_error_report=local_error_report) local_error_report=local_error_report,
maybe_local_error=maybe_local_error)
if expect_failure: if expect_failure:
return id return id
ev = hapd.wait_event([ "AP-STA-CONNECTED" ], timeout=5) ev = hapd.wait_event([ "AP-STA-CONNECTED" ], timeout=5)
@ -81,7 +82,8 @@ def eap_connect(dev, ap, method, identity,
return id return id
def eap_check_auth(dev, method, initial, rsn=True, sha256=False, def eap_check_auth(dev, method, initial, rsn=True, sha256=False,
expect_failure=False, local_error_report=False): expect_failure=False, local_error_report=False,
maybe_local_error=False):
ev = dev.wait_event(["CTRL-EVENT-EAP-STARTED"], timeout=10) ev = dev.wait_event(["CTRL-EVENT-EAP-STARTED"], timeout=10)
if ev is None: if ev is None:
raise Exception("Association and EAP start timed out") raise Exception("Association and EAP start timed out")
@ -95,6 +97,8 @@ def eap_check_auth(dev, method, initial, rsn=True, sha256=False,
if ev is None: if ev is None:
raise Exception("EAP failure timed out") raise Exception("EAP failure timed out")
ev = dev.wait_disconnected(timeout=10) ev = dev.wait_disconnected(timeout=10)
if maybe_local_error and "locally_generated=1" in ev:
return
if not local_error_report: if not local_error_report:
if "reason=23" not in ev: if "reason=23" not in ev:
raise Exception("Proper reason code for disconnection not reported") raise Exception("Proper reason code for disconnection not reported")
@ -3018,7 +3022,7 @@ def test_openssl_cipher_suite_config_wpas(dev, apdev):
anonymous_identity="ttls", password="password", anonymous_identity="ttls", password="password",
openssl_ciphers="EXPORT", openssl_ciphers="EXPORT",
ca_cert="auth_serv/ca.pem", phase2="auth=PAP", ca_cert="auth_serv/ca.pem", phase2="auth=PAP",
expect_failure=True) expect_failure=True, maybe_local_error=True)
dev[2].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS", dev[2].connect("test-wpa2-eap", key_mgmt="WPA-EAP", eap="TTLS",
identity="pap user", anonymous_identity="ttls", identity="pap user", anonymous_identity="ttls",
password="password", password="password",