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

dpp-nfc: Return failure status if operation fails

Browse Source 
For now, this is done only for the case where the NFC Device is not
usable and if writing a single tag fails.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-07-23 12:26:46 +03:00 committed by Jouni Malinen
parent 7e2edfbc1a
commit 74cd38ac69
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wpa_supplicant/examples/dpp-nfc.py
View File

@ -39,6 +39,7 @@ my_crn = None
peer_crn = None peer_crn = None
hs_sent = False hs_sent = False
netrole = None netrole = None
operation_success = False
mutex = threading.Lock() mutex = threading.Lock()
C_NORMAL = '\033[0m' C_NORMAL = '\033[0m'
@ -613,7 +614,8 @@ def rdwr_connected_write_tag(tag):
return return
success_report("Tag write succeeded") success_report("Tag write succeeded")
summary("Tag writing completed - remove tag", color=C_GREEN) summary("Tag writing completed - remove tag", color=C_GREEN)
global only_one global only_one, operation_success
operation_success = True
if only_one: if only_one:
global continue_loop global continue_loop
continue_loop = False continue_loop = False
@ -858,14 +860,18 @@ def main():
try: try:
if not clf.open(args.device): if not clf.open(args.device):
summary("Could not open connection with an NFC device", color=C_RED) summary("Could not open connection with an NFC device", color=C_RED)
raise SystemExit raise SystemExit(1)
if args.command == "write-nfc-uri": if args.command == "write-nfc-uri":
write_nfc_uri(clf, wait_remove=not args.no_wait) write_nfc_uri(clf, wait_remove=not args.no_wait)
if not operation_success:
raise SystemExit(1)
raise SystemExit raise SystemExit
if args.command == "write-nfc-hs": if args.command == "write-nfc-hs":
write_nfc_hs(clf, wait_remove=not args.no_wait) write_nfc_hs(clf, wait_remove=not args.no_wait)
if not operation_success:
raise SystemExit(1)
raise SystemExit raise SystemExit
global continue_loop global continue_loop