diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2015-04-10 12:57:07 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-04-10 13:02:56 +0200 |
| commit | c699b9ca94ed49d09250058a6ec0e762f4ab2faa (patch) | |
| tree | 9d05ed1339b254294966a9fea62ae59d4b92a9cc /src/external/bcrypt_pbkdf.c | |
| parent | 53586ed4ba43225e140791812074e4b21d7b2726 (diff) | |
| download | libssh-c699b9ca94ed49d09250058a6ec0e762f4ab2faa.tar.gz libssh-c699b9ca94ed49d09250058a6ec0e762f4ab2faa.tar.xz libssh-c699b9ca94ed49d09250058a6ec0e762f4ab2faa.zip | |
external: Use standard int types
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/external/bcrypt_pbkdf.c')
| -rw-r--r-- | src/external/bcrypt_pbkdf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/external/bcrypt_pbkdf.c b/src/external/bcrypt_pbkdf.c index a17855bc..7dbcaca2 100644 --- a/src/external/bcrypt_pbkdf.c +++ b/src/external/bcrypt_pbkdf.c @@ -59,10 +59,10 @@ #define BCRYPT_HASHSIZE (BCRYPT_BLOCKS * 4) static void -bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out) +bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out) { blf_ctx state; - u_int8_t ciphertext[BCRYPT_HASHSIZE] = + uint8_t ciphertext[BCRYPT_HASHSIZE] = "OxychromaticBlowfishSwatDynamite"; uint32_t cdata[BCRYPT_BLOCKS]; int i; @@ -100,14 +100,14 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out) } int -bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t saltlen, - u_int8_t *key, size_t keylen, unsigned int rounds) +bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltlen, + uint8_t *key, size_t keylen, unsigned int rounds) { - u_int8_t sha2pass[SHA512_DIGEST_LENGTH]; - u_int8_t sha2salt[SHA512_DIGEST_LENGTH]; - u_int8_t out[BCRYPT_HASHSIZE]; - u_int8_t tmpout[BCRYPT_HASHSIZE]; - u_int8_t *countsalt; + uint8_t sha2pass[SHA512_DIGEST_LENGTH]; + uint8_t sha2salt[SHA512_DIGEST_LENGTH]; + uint8_t out[BCRYPT_HASHSIZE]; + uint8_t tmpout[BCRYPT_HASHSIZE]; + uint8_t *countsalt; size_t i, j, amt, stride; uint32_t count; SHA512CTX ctx; |