jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Use hapd from hostapd.add_ap() in eap_connect()

Browse source 
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
Janusz Dziedzic 2016-04-07 07:38:07 +02:00 committed by Jouni Malinen
parent 50e49cd240
commit 3b3e26875a
2 changed files with 251 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

493
tests/hwsim/test_ap_eap.py
View file

File diff suppressed because it is too large Load diff

14
tests/hwsim/test_pmksa_cache.py
View file

@ -395,7 +395,7 @@ def generic_pmksa_cache_preauth(dev, apdev, extraparams, identity, databridge,
hapd = hostapd.add_ap(apdev[0], params) hapd = hostapd.add_ap(apdev[0], params)
subprocess.call(['brctl', 'setfd', 'ap-br0', '0']) subprocess.call(['brctl', 'setfd', 'ap-br0', '0'])
subprocess.call(['ip', 'link', 'set', 'dev', 'ap-br0', 'up']) subprocess.call(['ip', 'link', 'set', 'dev', 'ap-br0', 'up'])
eap_connect(dev[0], apdev[0], "PAX", identity, eap_connect(dev[0], hapd, "PAX", identity,
password_hex="0123456789abcdef0123456789abcdef") password_hex="0123456789abcdef0123456789abcdef")
# Verify connectivity in the correct VLAN # Verify connectivity in the correct VLAN
@ -707,10 +707,10 @@ def test_pmksa_cache_preauth_oom(dev, apdev):
def _test_pmksa_cache_preauth_oom(dev, apdev): def _test_pmksa_cache_preauth_oom(dev, apdev):
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap") params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
params['bridge'] = 'ap-br0' params['bridge'] = 'ap-br0'
hostapd.add_ap(apdev[0], params) hapd = hostapd.add_ap(apdev[0], params)
subprocess.call(['brctl', 'setfd', 'ap-br0', '0']) subprocess.call(['brctl', 'setfd', 'ap-br0', '0'])
subprocess.call(['ip', 'link', 'set', 'dev', 'ap-br0', 'up']) subprocess.call(['ip', 'link', 'set', 'dev', 'ap-br0', 'up'])
eap_connect(dev[0], apdev[0], "PAX", "pax.user@example.com", eap_connect(dev[0], hapd, "PAX", "pax.user@example.com",
password_hex="0123456789abcdef0123456789abcdef", password_hex="0123456789abcdef0123456789abcdef",
bssid=apdev[0]['bssid']) bssid=apdev[0]['bssid'])
@ -805,8 +805,8 @@ def test_pmksa_cache_preauth_timeout(dev, apdev):
def _test_pmksa_cache_preauth_timeout(dev, apdev): def _test_pmksa_cache_preauth_timeout(dev, apdev):
dev[0].request("SET dot11RSNAConfigSATimeout 1") dev[0].request("SET dot11RSNAConfigSATimeout 1")
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap") params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hostapd.add_ap(apdev[0], params) hapd = hostapd.add_ap(apdev[0], params)
eap_connect(dev[0], apdev[0], "PAX", "pax.user@example.com", eap_connect(dev[0], hapd, "PAX", "pax.user@example.com",
password_hex="0123456789abcdef0123456789abcdef", password_hex="0123456789abcdef0123456789abcdef",
bssid=apdev[0]['bssid']) bssid=apdev[0]['bssid'])
if "OK" not in dev[0].request("PREAUTH f2:11:22:33:44:55"): if "OK" not in dev[0].request("PREAUTH f2:11:22:33:44:55"):
@ -820,8 +820,8 @@ def _test_pmksa_cache_preauth_timeout(dev, apdev):
def test_pmksa_cache_preauth_wpas_oom(dev, apdev): def test_pmksa_cache_preauth_wpas_oom(dev, apdev):
"""RSN pre-authentication OOM in wpa_supplicant""" """RSN pre-authentication OOM in wpa_supplicant"""
params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap") params = hostapd.wpa2_eap_params(ssid="test-wpa2-eap")
hostapd.add_ap(apdev[0], params) hapd = hostapd.add_ap(apdev[0], params)
eap_connect(dev[0], apdev[0], "PAX", "pax.user@example.com", eap_connect(dev[0], hapd, "PAX", "pax.user@example.com",
password_hex="0123456789abcdef0123456789abcdef", password_hex="0123456789abcdef0123456789abcdef",
bssid=apdev[0]['bssid']) bssid=apdev[0]['bssid'])
for i in range(1, 11): for i in range(1, 11):