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

tests: DPP PKEX with netAccessKey curve change

Browse source 
Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-03-09 23:10:02 +02:00 committed by Jouni Malinen
parent 5ce5ed88a9
commit e792f38db8
2 changed files with 61 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
tests/hwsim/test_dpp.py
View file

@ -2680,6 +2680,58 @@ def test_dpp_pkex_hostapd_errors(dev, apdev):
raise Exception("Failed to flush PKEX responders") raise Exception("Failed to flush PKEX responders")
hapd.request("DPP_PKEX_REMOVE *") hapd.request("DPP_PKEX_REMOVE *")
def test_dpp_pkex_nak_curve_change(dev, apdev):
"""DPP PKEX with netAccessKey curve change"""
try:
run_dpp_pkex_nak_curve_change(dev, apdev)
finally:
dev[1].set("dpp_config_processing", "0", allow_fail=True)
def test_dpp_pkex_nak_curve_change2(dev, apdev):
"""DPP PKEX with netAccessKey curve change (2)"""
try:
run_dpp_pkex_nak_curve_change(dev, apdev, failure=True)
finally:
dev[1].set("dpp_config_processing", "0", allow_fail=True)
def run_dpp_pkex_nak_curve_change(dev, apdev, failure=False):
check_dpp_capab(dev[0], min_ver=3)
check_dpp_capab(dev[1], min_ver=3)
hapd = hostapd.add_ap(apdev[0], {"ssid": "unconfigured",
"channel": "6"})
check_dpp_capab(hapd, min_ver=3)
hapd.dpp_pkex_resp(2437, identifier="test-1", code="secret-1",
curve="secp384r1")
conf_id = dev[0].dpp_configurator_add()
dev[0].dpp_pkex_init(identifier="test-1", code="secret-1",
curve="secp384r1",
extra="conf=ap-dpp configurator=%d" % conf_id)
wait_auth_success(hapd, dev[0], configurator=dev[0], enrollee=hapd,
stop_initiator=True)
update_hapd_config(hapd)
dev[0].dump_monitor()
hapd.dump_monitor()
dev[1].set("dpp_config_processing", "2")
dev[1].dpp_pkex_resp(2437, identifier="test-2", code="secret-2")
if failure:
dev[0].dpp_configurator_set(conf_id, net_access_key_curve="prime256v1")
dev[0].dpp_pkex_init(identifier="test-2", code="secret-2",
extra="conf=sta-dpp configurator=%d" % conf_id)
wait_auth_success(dev[1], dev[0], configurator=dev[0], enrollee=dev[1],
stop_initiator=True)
if failure:
ev = dev[1].wait_event(["DPP-INTRO"], timeout=10)
if ev is None:
raise Exception("No DPP-INTRO message seen")
if "status=7" not in ev:
raise Exception("Unexpected DPP-INTRO contents: " + ev)
else:
dev[1].wait_connected()
dev[0].dump_monitor()
dev[1].dump_monitor()
hapd.dump_monitor()
def test_dpp_hostapd_configurator(dev, apdev): def test_dpp_hostapd_configurator(dev, apdev):
"""DPP with hostapd as configurator/initiator""" """DPP with hostapd as configurator/initiator"""
run_dpp_hostapd_configurator(dev, apdev) run_dpp_hostapd_configurator(dev, apdev)

10
tests/hwsim/wpasupplicant.py
View file

@ -1627,7 +1627,7 @@ class WpaSupplicant:
if curve: if curve:
cmd += " curve=" + curve cmd += " curve=" + curve
if net_access_key_curve: if net_access_key_curve:
cmd += " net_access_key_curve=" + curve cmd += " net_access_key_curve=" + net_access_key_curve
if key: if key:
cmd += " key=" + key cmd += " key=" + key
res = self.request(cmd) res = self.request(cmd)
@ -1635,6 +1635,14 @@ class WpaSupplicant:
raise Exception("Failed to add configurator") raise Exception("Failed to add configurator")
return int(res) return int(res)
def dpp_configurator_set(self, conf_id, net_access_key_curve=None):
cmd = "DPP_CONFIGURATOR_SET %d" % conf_id
if net_access_key_curve:
cmd += " net_access_key_curve=" + net_access_key_curve
res = self.request(cmd)
if "FAIL" in res:
raise Exception("Failed to set configurator")
def dpp_configurator_remove(self, conf_id): def dpp_configurator_remove(self, conf_id):
res = self.request("DPP_CONFIGURATOR_REMOVE %d" % conf_id) res = self.request("DPP_CONFIGURATOR_REMOVE %d" % conf_id)
if "OK" not in res: if "OK" not in res: