Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 00:38:24 -05:00
Code Issues Projects Releases Wiki Activity

tests: Set dh_file on EAP client

Browse Source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-02-15 10:42:56 +02:00
parent 6ab4a7aa5a
commit 242219c563
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/hwsim/test_ap_eap.py
View File

@ -24,7 +24,7 @@ def eap_connect(dev, ap, method, identity, anonymous_identity=None,
local_error_report=False, local_error_report=False,
ca_cert2=None, client_cert2=None, private_key2=None, ca_cert2=None, client_cert2=None, private_key2=None,
pac_file=None, subject_match=None, altsubject_match=None, pac_file=None, subject_match=None, altsubject_match=None,
private_key_passwd=None, ocsp=None): private_key_passwd=None, ocsp=None, dh_file=None):
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,
@ -40,7 +40,7 @@ def eap_connect(dev, ap, method, identity, anonymous_identity=None,
subject_match=subject_match, subject_match=subject_match,
altsubject_match=altsubject_match, altsubject_match=altsubject_match,
private_key_passwd=private_key_passwd, private_key_passwd=private_key_passwd,
ocsp=ocsp) ocsp=ocsp, dh_file=dh_file)
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)
@ -964,3 +964,12 @@ def test_ap_wpa2_eap_ttls_server_cert_eku_client(dev, apdev):
ev = dev[0].wait_event(["CTRL-EVENT-EAP-FAILURE"]) ev = dev[0].wait_event(["CTRL-EVENT-EAP-FAILURE"])
if ev is None: if ev is None:
raise Exception("Timeout on EAP failure report") raise Exception("Timeout on EAP failure report")
def test_ap_wpa2_eap_ttls_dh_params(dev, apdev):
"""WPA2-Enterprise connection using EAP-TTLS/CHAP and setting DH params"""
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hostapd.add_ap(apdev[0]['ifname'], params)
eap_connect(dev[0], apdev[0], "TTLS", "chap user",
anonymous_identity="ttls", password="password",
ca_cert="auth_serv/ca.der", phase2="auth=CHAP",
dh_file="auth_serv/dh.conf")

5
tests/hwsim/wpasupplicant.py
View File

@ -603,7 +603,8 @@ class WpaSupplicant:
ca_cert2=None, client_cert2=None, private_key2=None, ca_cert2=None, client_cert2=None, private_key2=None,
scan_ssid=None, raw_psk=None, pac_file=None, scan_ssid=None, raw_psk=None, pac_file=None,
subject_match=None, altsubject_match=None, subject_match=None, altsubject_match=None,
private_key_passwd=None, ocsp=None, auth_alg=None): private_key_passwd=None, ocsp=None, auth_alg=None,
dh_file=None):
logger.info("Connect STA " + self.ifname + " to AP") logger.info("Connect STA " + self.ifname + " to AP")
id = self.add_network() id = self.add_network()
if ssid: if ssid:
@ -683,6 +684,8 @@ class WpaSupplicant:
self.set_network(id, "ocsp", str(ocsp)) self.set_network(id, "ocsp", str(ocsp))
if auth_alg: if auth_alg:
self.set_network(id, "auth_alg", auth_alg) self.set_network(id, "auth_alg", auth_alg)
if dh_file:
self.set_network_quoted(id, "dh_file", dh_file)
if only_add_network: if only_add_network:
return id return id
if wait_connect: if wait_connect: