Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-31 01:04:03 -05:00
Code Issues Projects Releases Wiki Activity

WPS: Add a workaround for incorrect passphrase encoding in Network Key

Browse Source 
External Registrar in Vista may include NULL termination in the Network
Key when encoding an ASCII passphrase for WPA/WPA2-PSK. As a workaround,
remove this extra octet if present.
This commit is contained in:
Jouni Malinen 2009-01-24 12:50:00 +02:00
parent 3b2cf800af
commit 1a5a04c3de
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wps/wps_attr_process.c
View File

@ -257,6 +257,23 @@ static int wps_process_cred_802_1x_enabled(struct wps_credential *cred,
} }
static void wps_workaround_cred_key(struct wps_credential *cred)
{
if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK) &&
cred->key_len > 8 && cred->key_len < 64 &&
cred->key[cred->key_len - 1] == 0) {
/*
* A deployed external registrar is known to encode ASCII
* passphrases incorrectly. Remove the extra NULL termination
* to fix the encoding.
*/
wpa_printf(MSG_DEBUG, "WPS: Workaround - remove NULL "
"termination from ASCII passphrase");
cred->key_len--;
}
}
int wps_process_cred(struct wps_parse_attr *attr, int wps_process_cred(struct wps_parse_attr *attr,
struct wps_credential *cred) struct wps_credential *cred)
{ {
@ -279,6 +296,8 @@ int wps_process_cred(struct wps_parse_attr *attr,
wps_process_cred_802_1x_enabled(cred, attr->dot1x_enabled)) wps_process_cred_802_1x_enabled(cred, attr->dot1x_enabled))
return -1; return -1;
wps_workaround_cred_key(cred);
return 0; return 0;
} }
@ -298,5 +317,7 @@ int wps_process_ap_settings(struct wps_parse_attr *attr,
wps_process_cred_mac_addr(cred, attr->mac_addr)) wps_process_cred_mac_addr(cred, attr->mac_addr))
return -1; return -1;
wps_workaround_cred_key(cred);
return 0; return 0;
} }