diff options
| author |   tedu <tedu@openbsd.org> | 2013-07-29 00:55:53 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2013-07-29 00:55:53 +0000 |
| commit | d4a1d777ec2862b1aa73890f38a83ad8deca62a9 (patch) | |
| tree | 9476dc2064fc0e3b1154723c94930554ddbeac7b /lib/libutil | |
| parent | Build awk with -O1 on m88k for now; when built -O2, it would sporadically (diff) | |
| download | wireguard-openbsd-d4a1d777ec2862b1aa73890f38a83ad8deca62a9.tar.xz wireguard-openbsd-d4a1d777ec2862b1aa73890f38a83ad8deca62a9.zip | |
fix a colossal cockup due to pointer/array confusion.
code isn't used yet, thankfully.
first observed by djm running regress. ok deraadt djm
Diffstat (limited to 'lib/libutil')
| -rw-r--r-- | lib/libutil/bcrypt_pbkdf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/libutil/bcrypt_pbkdf.c b/lib/libutil/bcrypt_pbkdf.c index 28339039371..0c1c1c52fbc 100644 --- a/lib/libutil/bcrypt_pbkdf.c +++ b/lib/libutil/bcrypt_pbkdf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt_pbkdf.c,v 1.3 2013/06/04 15:55:50 tedu Exp $ */ +/* $OpenBSD: bcrypt_pbkdf.c,v 1.4 2013/07/29 00:55:53 tedu Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -52,8 +52,7 @@ #define BCRYPT_HASHSIZE (BCRYPT_BLOCKS * 4) static void -bcrypt_hash(uint8_t sha2pass[SHA512_DIGEST_LENGTH], - uint8_t sha2salt[SHA512_DIGEST_LENGTH], uint8_t out[BCRYPT_HASHSIZE]) +bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out) { blf_ctx state; uint8_t ciphertext[BCRYPT_HASHSIZE] = @@ -61,14 +60,14 @@ bcrypt_hash(uint8_t sha2pass[SHA512_DIGEST_LENGTH], uint32_t cdata[BCRYPT_BLOCKS]; int i; uint16_t j; + size_t shalen = SHA512_DIGEST_LENGTH; /* key expansion */ Blowfish_initstate(&state); - Blowfish_expandstate(&state, sha2salt, sizeof(sha2salt), sha2pass, - sizeof(sha2pass)); + Blowfish_expandstate(&state, sha2salt, shalen, sha2pass, shalen); for (i = 0; i < 64; i++) { - Blowfish_expand0state(&state, sha2salt, sizeof(sha2salt)); - Blowfish_expand0state(&state, sha2pass, sizeof(sha2pass)); + Blowfish_expand0state(&state, sha2salt, shalen); + Blowfish_expand0state(&state, sha2pass, shalen); } /* encryption */ |