diff options
| author | Damien Miller <djm@mindrot.org> | 2015-05-05 19:10:23 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-05-10 11:57:27 +1000 |
| commit | f6391d4e59b058984163ab28f4e317e7a72478f1 (patch) | |
| tree | 06075ecf44c25cc865c4a0445ef1e761908ba19b | |
| parent | 8ac6b13cc9113eb47cd9e86c97d7b26b4b71b77f (diff) | |
upstream commit
- deraadt@cvs.openbsd.org 2015/01/08 00:30:07
[bcrypt_pbkdf.c]
declare a local version of MIN(), call it MINIMUM()
| -rw-r--r-- | openbsd-compat/bcrypt_pbkdf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c index f412829b..905fc5d4 100644 --- a/openbsd-compat/bcrypt_pbkdf.c +++ b/openbsd-compat/bcrypt_pbkdf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt_pbkdf.c,v 1.10 2014/12/30 01:41:43 djm Exp $ */ +/* $OpenBSD: bcrypt_pbkdf.c,v 1.12 2015/01/08 00:30:07 deraadt Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -37,6 +37,8 @@ #endif #define SHA512_DIGEST_LENGTH crypto_hash_sha512_BYTES +#define MINIMUM(a,b) (((a) < (b)) ? (a) : (b)) + /* * pkcs #5 pbkdf2 implementation using the "bcrypt" hash * @@ -158,7 +160,7 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t salt /* * pbkdf2 deviation: output the key material non-linearly. */ - amt = MIN(amt, keylen); + amt = MINIMUM(amt, keylen); for (i = 0; i < amt; i++) { size_t dest = i * stride + (count - 1); if (dest >= origkeylen) |