1 files changed, 10 insertions, 8 deletions

diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c
index 16912575a..0a07f9a0f 100644
--- a/openbsd-compat/bcrypt_pbkdf.c
+++ b/openbsd-compat/bcrypt_pbkdf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcrypt_pbkdf.c,v 1.9 2014/07/13 21:21:25 tedu Exp $ */
+/* $OpenBSD: bcrypt_pbkdf.c,v 1.13 2015/01/12 03:20:04 tedu 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
  *
@@ -61,8 +63,8 @@
  * wise caller could do; we just do it for you.
  */
 
-#define BCRYPT_BLOCKS 8
-#define BCRYPT_HASHSIZE (BCRYPT_BLOCKS * 4)
+#define BCRYPT_WORDS 8
+#define BCRYPT_HASHSIZE (BCRYPT_WORDS * 4)
 
 static void
 bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out)
@@ -70,7 +72,7 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out)
         blf_ctx state;
         u_int8_t ciphertext[BCRYPT_HASHSIZE] =
             "OxychromaticBlowfishSwatDynamite";
-        uint32_t cdata[BCRYPT_BLOCKS];
+        uint32_t cdata[BCRYPT_WORDS];
         int i;
         uint16_t j;
         size_t shalen = SHA512_DIGEST_LENGTH;
@@ -85,14 +87,14 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, u_int8_t *out)
 
         /* encryption */
         j = 0;
-        for (i = 0; i < BCRYPT_BLOCKS; i++)
+        for (i = 0; i < BCRYPT_WORDS; i++)
                 cdata[i] = Blowfish_stream2word(ciphertext, sizeof(ciphertext),
                     &j);
         for (i = 0; i < 64; i++)
                 blf_enc(&state, cdata, sizeof(cdata) / sizeof(uint64_t));
 
         /* copy out */
-        for (i = 0; i < BCRYPT_BLOCKS; i++) {
+        for (i = 0; i < BCRYPT_WORDS; i++) {
                 out[4 * i + 3] = (cdata[i] >> 24) & 0xff;
                 out[4 * i + 2] = (cdata[i] >> 16) & 0xff;
                 out[4 * i + 1] = (cdata[i] >> 8) & 0xff;
@@ -156,9 +158,9 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const u_int8_t *salt, size_t salt
                 }
 
                 /*
-                 * pbkdf2 deviation: ouput the key material non-linearly.
+                 * 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)