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

WPS NFC: Validate ctrl_iface response before decoding it

Browse source 
If the operation fails for any reason ("FAIL" response), it is cleaner
to return error clearly instead of hitting an exception in the hex
decoder.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-11-29 12:46:41 +02:00 committed by Jouni Malinen
parent ab1db08c05
commit 79ede5a7e6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wpa_supplicant/examples/wps-nfc.py
View file

@ -75,7 +75,10 @@ def wpas_get_er_config_token(uuid):
wpas = wpas_connect()
if (wpas == None):
return None
return wpas.request("WPS_ER_NFC_CONFIG_TOKEN NDEF " + uuid).rstrip().decode("hex")
ret = wpas.request("WPS_ER_NFC_CONFIG_TOKEN NDEF " + uuid)
if "FAIL" in ret:
return None
return ret.rstrip().decode("hex")
def wpas_get_password_token():
@ -97,8 +100,12 @@ def wpas_get_handover_sel(uuid):
if (wpas == None):
return None
if uuid is None:
return wpas.request("NFC_GET_HANDOVER_SEL NDEF WPS-CR").rstrip().decode("hex")
return wpas.request("NFC_GET_HANDOVER_SEL NDEF WPS-CR " + uuid).rstrip().decode("hex")
res = wpas.request("NFC_GET_HANDOVER_SEL NDEF WPS-CR").rstrip()
else:
res = wpas.request("NFC_GET_HANDOVER_SEL NDEF WPS-CR " + uuid).rstrip()
if "FAIL" in res:
return None
return res.decode("hex")
def wpas_report_handover(req, sel, type):