xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wifi: get rid of custom hextob() routine, use dec16(), avoid copies in parsekey()

Browse source
This commit is contained in:
cinap_lenrek 2017-12-31 01:49:58 +01:00
parent 8a64413eca
commit ee89c82dd3
1 changed files with 38 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
sys/src/9/pc/wifi.c
View file

@ -806,29 +806,6 @@ wifiattach(Ether *ether, void (*transmit)(Wifi*, Wnode*, Block*))
return wifi; return wifi;
} }
static int
hextob(char *s, char **sp, uchar *b, int n)
{
int r;
n <<= 1;
for(r = 0; r < n && *s; s++){
*b <<= 4;
if(*s >= '0' && *s <= '9')
*b |= (*s - '0');
else if(*s >= 'a' && *s <= 'f')
*b |= 10+(*s - 'a');
else if(*s >= 'A' && *s <= 'F')
*b |= 10+(*s - 'A');
else break;
if((++r & 1) == 0)
b++;
}
if(sp != nil)
*sp = s;
return r >> 1;
}
static char *ciphers[] = { static char *ciphers[] = {
[0] "clear", [0] "clear",
[TKIP] "tkip", [TKIP] "tkip",
@ -838,45 +815,55 @@ static char *ciphers[] = {
static Wkey* static Wkey*
parsekey(char *s) parsekey(char *s)
{ {
char buf[256], *p; static char Ebadkey[] = "bad key";
uchar key[32]; uchar key[32];
int i, n; int len, cipher;
char *e;
Wkey *k; Wkey *k;
strncpy(buf, s, sizeof(buf)-1); for(cipher=0; cipher<nelem(ciphers); cipher++){
buf[sizeof(buf)-1] = 0; if(strncmp(s, ciphers[cipher], len = strlen(ciphers[cipher])) == 0){
if((p = strchr(buf, ':')) != nil) if(cipher == 0) /* clear */
*p++ = 0; return nil;
else if(s[len] == ':'){
p = buf; s += len+1;
n = hextob(p, &p, key, sizeof(key)); break;
for(i=0; i<nelem(ciphers); i++) }
if(strcmp(ciphers[i], buf) == 0) }
break; }
switch(i){ if(cipher >= nelem(ciphers))
case 0: error(Ebadkey);
k = secalloc(sizeof(Wkey));
break; if((e = strchr(s, '@')) == nil)
e = strchr(s, 0);
len = dec16(key, sizeof(key), s, e - s);
switch(cipher){
case TKIP: case TKIP:
if(n != 32) if(len != 32)
return nil; error(Ebadkey);
k = secalloc(sizeof(Wkey) + n); k = secalloc(sizeof(Wkey) + len);
memmove(k->key, key, n); memmove(k->key, key, len);
break; break;
case CCMP: case CCMP:
if(n != 16) if(len != 16)
return nil; error(Ebadkey);
k = secalloc(sizeof(Wkey) + sizeof(AESstate)); k = secalloc(sizeof(Wkey) + sizeof(AESstate));
setupAESstate((AESstate*)k->key, key, n, nil); setupAESstate((AESstate*)k->key, key, len, nil);
break; break;
default: default:
error(Ebadkey);
return nil; return nil;
} }
memset(key, 0, sizeof(key)); memset(key, 0, sizeof(key));
if(*p == '@')
k->tsc = strtoull(++p, nil, 16); if(*e++ == '@')
k->len = n; k->tsc = strtoull(e, nil, 16);
k->cipher = i; k->len = len;
k->cipher = cipher;
return k; return k;
} }
@ -998,7 +985,7 @@ wifictl(Wifi *wifi, void *buf, long n)
if(cb->f[1] == nil) if(cb->f[1] == nil)
wn->rsnelen = 0; wn->rsnelen = 0;
else else
wn->rsnelen = hextob(cb->f[1], nil, wn->rsne, sizeof(wn->rsne)); wn->rsnelen = dec16(wn->rsne, sizeof(wn->rsne), cb->f[1], strlen(cb->f[1]));
if(wn->aid == 0){ if(wn->aid == 0){
setstatus(wifi, wn, Sconn); setstatus(wifi, wn, Sconn);
sendauth(wifi, wn); sendauth(wifi, wn);
@ -1012,13 +999,7 @@ wifictl(Wifi *wifi, void *buf, long n)
if(cb->f[1] == nil) if(cb->f[1] == nil)
error(Ebadarg); error(Ebadarg);
k = parsekey(cb->f[1]); k = parsekey(cb->f[1]);
if(k == nil)
error("bad key");
memset(cb->f[1], 0, strlen(cb->f[1])); memset(cb->f[1], 0, strlen(cb->f[1]));
if(k->cipher == 0){
secfree(k);
k = nil;
}
if(ct->index < CMtxkey0) if(ct->index < CMtxkey0)
kk = &wn->rxkey[ct->index - CMrxkey0]; kk = &wn->rxkey[ct->index - CMrxkey0];
else else