stv0g/eyefi-config
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't clobber password.

Browse source 
We used to clobber the password that came in from the user
when converting it from ASCII to binary for WEP.  That
screwed it up because we need to use it twice: once for
testing, and once for the actual addition.
This commit is contained in:
Dave Hansen 2009-02-17 09:32:22 -08:00
parent 468520221a
commit 447da84444
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eyefi-config.c
View file

@ -405,15 +405,17 @@ char *convert_ascii_to_hex(char *ascii, int len)
int make_network_key(struct network_key *key, char *essid, char *pass)
{
char *hex_pass;
char tmp[WPA_KEY_BYTES+WEP_KEY_BYTES];
int pass_len = strlen(pass);
char *hex_pass;
memset(key, 0, sizeof(*key));
strcpy(&tmp[0], pass);
eyefi_printf(" interpreting passphrase as ");
switch (pass_len) {
case WPA_KEY_BYTES*2:
eyefi_printf("hex WPA");
hex_pass = convert_ascii_to_hex(pass, pass_len);
hex_pass = convert_ascii_to_hex(tmp, pass_len);
if (!hex_pass)
return -EINVAL;
key->len = pass_len/2;
@ -421,7 +423,7 @@ int make_network_key(struct network_key *key, char *essid, char *pass)
break;
case WEP_KEY_BYTES*2:
eyefi_printf("hex WEP");
hex_pass = convert_ascii_to_hex(pass, strlen(pass));
hex_pass = convert_ascii_to_hex(tmp, strlen(pass));
if (!hex_pass)
return -EINVAL;
key->len = pass_len/2;
@ -654,7 +656,7 @@ int network_action(char cmd, char *essid, char *ascii_password)
void add_network(char *essid, char *ascii_password)
{
debug_printf(2, "%s()\n", __func__);
debug_printf(2, "%s('%s', '%s')\n", __func__, essid, ascii_password);
network_action('a', essid, ascii_password);
}