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

dpp-nfc: Do not allow more than one alternative channel proposal

Browse source 
This avoids potential loops of endless alternative URI exchanges over
NFC negotiated connection handover. Only allow one such alternative
proposal and declarare the handover as a failure if another alternative
were needed.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-07-24 00:51:49 +03:00 committed by Jouni Malinen
parent 6eaee933d7
commit 7d27bcb8e7
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wpa_supplicant/examples/dpp-nfc.py
View file

@ -41,6 +41,7 @@ hs_sent = False
netrole = None netrole = None
operation_success = False operation_success = False
mutex = threading.Lock() mutex = threading.Lock()
no_alt_proposal = False
C_NORMAL = '\033[0m' C_NORMAL = '\033[0m'
C_RED = '\033[91m' C_RED = '\033[91m'
@ -388,7 +389,10 @@ def dpp_handover_client(llc, alt=False):
summary("Failed to initiate DPP authentication", color=C_RED) summary("Failed to initiate DPP authentication", color=C_RED)
break break
if not dpp_found: global no_alt_proposal
if not dpp_found and no_alt_proposal:
summary("DPP carrier not seen in response - do not allow alternative proposal anymore")
elif not dpp_found:
summary("DPP carrier not seen in response - allow peer to initiate a new handover with different parameters") summary("DPP carrier not seen in response - allow peer to initiate a new handover with different parameters")
my_crn_ready = False my_crn_ready = False
my_crn = None my_crn = None
@ -561,16 +565,21 @@ class HandoverServer(nfc.handover.HandoverServer):
sel = [hs, carrier] sel = [hs, carrier]
break break
global hs_sent global hs_sent, no_alt_proposal
summary("Sending handover select: " + str(sel)) summary("Sending handover select: " + str(sel))
if found: if found:
summary("Handover completed successfully") summary("Handover completed successfully")
self.success = True self.success = True
hs_sent = True hs_sent = True
elif no_alt_proposal:
summary("Do not try alternative proposal anymore - handover failed",
color=C_RED)
hs_sent = True
else: else:
summary("Try to initiate with alternative parameters") summary("Try to initiate with alternative parameters")
self.try_own = True self.try_own = True
hs_sent = False hs_sent = False
no_alt_proposal = True
threading.Thread(target=llcp_worker, args=(self.llc, True)).start() threading.Thread(target=llcp_worker, args=(self.llc, True)).start()
return sel return sel
@ -775,11 +784,13 @@ def llcp_startup(llc):
def llcp_connected(llc): def llcp_connected(llc):
summary("P2P LLCP connected") summary("P2P LLCP connected")
global wait_connection, my_crn, peer_crn, my_crn_ready, hs_sent global wait_connection, my_crn, peer_crn, my_crn_ready, hs_sent
global no_alt_proposal
wait_connection = False wait_connection = False
my_crn_ready = False my_crn_ready = False
my_crn = None my_crn = None
peer_crn = None peer_crn = None
hs_sent = False hs_sent = False
no_alt_proposal = False
global srv global srv
srv.start() srv.start()
if init_on_touch or not no_input: if init_on_touch or not no_input: