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

wpa_passphrase: Reject invalid passphrase

Browse Source 
Reject a passphrase with control characters instead of trying to write
out an example network configuration block with such control characters
included.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-12-05 15:36:56 +02:00 committed by Jouni Malinen
parent d1ea80361b
commit 5ec3d510e1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wpa_supplicant/wpa_passphrase.c
View File

@ -17,6 +17,7 @@ int main(int argc, char *argv[])
unsigned char psk[32]; unsigned char psk[32];
int i; int i;
char *ssid, *passphrase, buf[64], *pos; char *ssid, *passphrase, buf[64], *pos;
size_t len;
if (argc < 2) { if (argc < 2) {
printf("usage: wpa_passphrase <ssid> [passphrase]\n" printf("usage: wpa_passphrase <ssid> [passphrase]\n"
@ -47,10 +48,15 @@ int main(int argc, char *argv[])
passphrase = buf; passphrase = buf;
} }
if (os_strlen(passphrase) < 8 || os_strlen(passphrase) > 63) { len = os_strlen(passphrase);
if (len < 8 || len > 63) {
printf("Passphrase must be 8..63 characters\n"); printf("Passphrase must be 8..63 characters\n");
return 1; return 1;
} }
if (has_ctrl_char((u8 *) passphrase, len)) {
printf("Invalid passphrase character\n");
return 1;
}
pbkdf2_sha1(passphrase, (u8 *) ssid, os_strlen(ssid), 4096, psk, 32); pbkdf2_sha1(passphrase, (u8 *) ssid, os_strlen(ssid), 4096, psk, 32);