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

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

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 63e6e62f23
commit 4063590525
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/hwsim/test_nfc_wps.py
View file

@ -392,16 +392,16 @@ def test_nfc_wps_handover_pk_hash_mismatch_ap(dev, apdev):
def start_ap_er(er, ap, ssid): def start_ap_er(er, ap, ssid):
ap_pin = "12345670" ap_pin = "12345670"
ap_uuid = "27ea801a-9e5c-4e73-bd82-f89cbcd10d7e" ap_uuid = "27ea801a-9e5c-4e73-bd82-f89cbcd10d7e"
hostapd.add_ap(ap, params = { "ssid": ssid, "eap_server": "1", "wps_state": "2",
{ "ssid": ssid, "eap_server": "1", "wps_state": "2", "wpa_passphrase": "12345678", "wpa": "2",
"wpa_passphrase": "12345678", "wpa": "2", "wpa_key_mgmt": "WPA-PSK", "rsn_pairwise": "CCMP",
"wpa_key_mgmt": "WPA-PSK", "rsn_pairwise": "CCMP", "device_name": "Wireless AP", "manufacturer": "Company",
"device_name": "Wireless AP", "manufacturer": "Company", "model_name": "WAP", "model_number": "123",
"model_name": "WAP", "model_number": "123", "serial_number": "12345", "device_type": "6-0050F204-1",
"serial_number": "12345", "device_type": "6-0050F204-1", "os_version": "01020300",
"os_version": "01020300", "config_methods": "label push_button",
"config_methods": "label push_button", "ap_pin": ap_pin, "uuid": ap_uuid, "upnp_iface": "lo"}
"ap_pin": ap_pin, "uuid": ap_uuid, "upnp_iface": "lo"}) hapd = hostapd.add_ap(ap, params)
logger.info("Learn AP configuration") logger.info("Learn AP configuration")
er.dump_monitor() er.dump_monitor()
try: try:
@ -422,6 +422,7 @@ def start_ap_er(er, ap, ssid):
logger.info("Use learned network configuration on ER") logger.info("Use learned network configuration on ER")
er.request("WPS_ER_SET_CONFIG " + ap_uuid + " 0") er.request("WPS_ER_SET_CONFIG " + ap_uuid + " 0")
return hapd
def test_nfc_wps_er_pw_token(dev, apdev): def test_nfc_wps_er_pw_token(dev, apdev):
"""WPS NFC password token from Enrollee to ER""" """WPS NFC password token from Enrollee to ER"""
@ -433,8 +434,7 @@ def test_nfc_wps_er_pw_token(dev, apdev):
def _test_nfc_wps_er_pw_token(dev, apdev): def _test_nfc_wps_er_pw_token(dev, apdev):
ssid = "wps-nfc-er-pw-token" ssid = "wps-nfc-er-pw-token"
start_ap_er(dev[0], apdev[0], ssid) hapd = start_ap_er(dev[0], apdev[0], ssid)
hapd = hostapd.Hostapd(apdev[0]['ifname'])
logger.info("WPS provisioning step using password token from station") logger.info("WPS provisioning step using password token from station")
dev[1].request("SET ignore_old_scan_res 1") dev[1].request("SET ignore_old_scan_res 1")
pw = dev[1].request("WPS_NFC_TOKEN NDEF").rstrip() pw = dev[1].request("WPS_NFC_TOKEN NDEF").rstrip()
@ -463,8 +463,7 @@ def test_nfc_wps_er_config_token(dev, apdev):
def _test_nfc_wps_er_config_token(dev, apdev): def _test_nfc_wps_er_config_token(dev, apdev):
ssid = "wps-nfc-er-config-token" ssid = "wps-nfc-er-config-token"
start_ap_er(dev[0], apdev[0], ssid) hapd = start_ap_er(dev[0], apdev[0], ssid)
hapd = hostapd.Hostapd(apdev[0]['ifname'])
logger.info("WPS provisioning step using configuration token from ER") logger.info("WPS provisioning step using configuration token from ER")
wps = dev[0].request("WPS_ER_NFC_CONFIG_TOKEN WPS " + apdev[0]['bssid']).rstrip() wps = dev[0].request("WPS_ER_NFC_CONFIG_TOKEN WPS " + apdev[0]['bssid']).rstrip()
if "FAIL" in wps: if "FAIL" in wps:
@ -488,8 +487,7 @@ def test_nfc_wps_er_handover(dev, apdev):
def _test_nfc_wps_er_handover(dev, apdev): def _test_nfc_wps_er_handover(dev, apdev):
ssid = "wps-nfc-er-handover" ssid = "wps-nfc-er-handover"
start_ap_er(dev[0], apdev[0], ssid) hapd = start_ap_er(dev[0], apdev[0], ssid)
hapd = hostapd.Hostapd(apdev[0]['ifname'])
logger.info("WPS provisioning step using connection handover") logger.info("WPS provisioning step using connection handover")
req = dev[1].request("NFC_GET_HANDOVER_REQ NDEF WPS-CR").rstrip() req = dev[1].request("NFC_GET_HANDOVER_REQ NDEF WPS-CR").rstrip()
if "FAIL" in req: if "FAIL" in req:
@ -517,8 +515,7 @@ def test_nfc_wps_er_handover_pk_hash_mismatch_sta(dev, apdev):
def _test_nfc_wps_er_handover_pk_hash_mismatch_sta(dev, apdev): def _test_nfc_wps_er_handover_pk_hash_mismatch_sta(dev, apdev):
ssid = "wps-nfc-er-handover-pkhash-sta" ssid = "wps-nfc-er-handover-pkhash-sta"
start_ap_er(dev[0], apdev[0], ssid) hapd = start_ap_er(dev[0], apdev[0], ssid)
hapd = hostapd.Hostapd(apdev[0]['ifname'])
logger.info("WPS provisioning step using connection handover") logger.info("WPS provisioning step using connection handover")
if "FAIL" in dev[1].request("SET wps_corrupt_pkhash 1"): if "FAIL" in dev[1].request("SET wps_corrupt_pkhash 1"):
raise Exception("Could not enable wps_corrupt_pkhash") raise Exception("Could not enable wps_corrupt_pkhash")
@ -552,8 +549,7 @@ def test_nfc_wps_er_handover_pk_hash_mismatch_er(dev, apdev):
def _test_nfc_wps_er_handover_pk_hash_mismatch_er(dev, apdev): def _test_nfc_wps_er_handover_pk_hash_mismatch_er(dev, apdev):
ssid = "wps-nfc-er-handover-pkhash-er" ssid = "wps-nfc-er-handover-pkhash-er"
start_ap_er(dev[0], apdev[0], ssid) hapd = start_ap_er(dev[0], apdev[0], ssid)
hapd = hostapd.Hostapd(apdev[0]['ifname'])
logger.info("WPS provisioning step using connection handover") logger.info("WPS provisioning step using connection handover")
if "FAIL" in dev[0].request("SET wps_corrupt_pkhash 1"): if "FAIL" in dev[0].request("SET wps_corrupt_pkhash 1"):
raise Exception("Could not enable wps_corrupt_pkhash") raise Exception("Could not enable wps_corrupt_pkhash")