diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-08-20 00:45:08 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-08-20 00:45:08 +0200 |
| commit | a40c4006d21d6e553d805da7d1a297bdce42f571 (patch) | |
| tree | f58944ec948ee5163bad60cdcc5694edc12203ae /sys/src/cmd/auth | |
| parent | d3f05df5d6839e179222cf691ab9a455044687ea (diff) | |
libsec: add pbkdf2_hmac_sha1() (from wpapsk factotum module)
Diffstat (limited to 'sys/src/cmd/auth')
| -rw-r--r-- | sys/src/cmd/auth/factotum/wpapsk.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/sys/src/cmd/auth/factotum/wpapsk.c b/sys/src/cmd/auth/factotum/wpapsk.c index 785d1c0ff..a76cb4ac8 100644 --- a/sys/src/cmd/auth/factotum/wpapsk.c +++ b/sys/src/cmd/auth/factotum/wpapsk.c @@ -35,32 +35,6 @@ struct State uchar resp[PTKlen]; }; -static void -pbkdf2(uchar *p, ulong plen, uchar *s, ulong slen, ulong rounds, uchar *d, ulong dlen) -{ - uchar block[SHA1dlen], tmp[SHA1dlen], tmp2[SHA1dlen]; - ulong i, j, k, n; - DigestState *ds; - - for(i = 1; dlen > 0; i++, d += n, dlen -= n){ - tmp[3] = i; - tmp[2] = i >> 8; - tmp[1] = i >> 16; - tmp[0] = i >> 24; - ds = hmac_sha1(s, slen, p, plen, nil, nil); - hmac_sha1(tmp, 4, p, plen, block, ds); - memmove(tmp, block, sizeof(tmp)); - for(j = 1; j < rounds; j++){ - hmac_sha1(tmp, sizeof(tmp), p, plen, tmp2, nil); - memmove(tmp, tmp2, sizeof(tmp)); - for(k=0; k<sizeof(tmp); k++) - block[k] ^= tmp[k]; - } - n = dlen > sizeof(block) ? sizeof(block) : dlen; - memmove(d, block, n); - } -} - static int hextob(char *s, char **sp, uchar *b, int n) { @@ -89,7 +63,7 @@ pass2pmk(char *pass, char *ssid, uchar pmk[PMKlen]) { if(hextob(pass, nil, pmk, PMKlen) == PMKlen) return; - pbkdf2((uchar*)pass, strlen(pass), (uchar*)ssid, strlen(ssid), 4096, pmk, PMKlen); + pbkdf2_hmac_sha1((uchar*)pass, strlen(pass), (uchar*)ssid, strlen(ssid), 4096, pmk, PMKlen); } static void |