6 files changed, 18 insertions, 12 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)
diff --git a/openbsd-compat/blowfish.c b/openbsd-compat/blowfish.c
index 6c419549e..e10f7e7d9 100644
--- a/openbsd-compat/blowfish.c
+++ b/openbsd-compat/blowfish.c
@@ -50,7 +50,9 @@
 #endif
 
 #include <sys/types.h>
+#ifdef HAVE_BLF_H
 #include <blf.h>
+#endif
 
 #undef inline
 #ifdef __GNUC__
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index a2d82126d..8672ccf7f 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -68,7 +68,7 @@ cygwin_ssh_privsep_user()
       if (cygwin_internal (CW_CYGNAME_FROM_WINNAME, "sshd", cyg_privsep_user,
                            sizeof cyg_privsep_user) != 0)
 #endif
-        strcpy (cyg_privsep_user, "sshd");
+        strlcpy(cyg_privsep_user, "sshd", sizeof(cyg_privsep_user));
     }
   return cyg_privsep_user;
 }
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index 65c18ec2f..ff347a24b 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -111,7 +111,7 @@ pid_t getpgid(pid_t);
 #endif
 
 #ifndef HAVE_ENDGRENT
-# define endgrent() {}
+# define endgrent() do { } while(0)
 #endif
 
 #ifndef HAVE_KRB5_GET_ERROR_MESSAGE
@@ -119,7 +119,7 @@ pid_t getpgid(pid_t);
 #endif
 
 #ifndef HAVE_KRB5_FREE_ERROR_MESSAGE
-# define krb5_free_error_message(a,b) while(0)
+# define krb5_free_error_message(a,b) do { } while(0)
 #endif
 
 #endif /* _BSD_MISC_H */
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 1cffefe06..cb59ccd57 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -221,7 +221,7 @@ long long strtonum(const char *, long long, long long, const char **);
 
 /* multibyte character support */
 #ifndef HAVE_MBLEN
-# define mblen(x, y)    1
+# define mblen(x, y)    (1)
 #endif
 
 #if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF)
diff --git a/openbsd-compat/rmd160.c b/openbsd-compat/rmd160.c
index 2a14dd7b0..e915141a5 100644
--- a/openbsd-compat/rmd160.c
+++ b/openbsd-compat/rmd160.c
@@ -32,7 +32,9 @@
 #ifndef WITH_OPENSSL
 
 #include <sys/types.h>
+#ifdef HAVE_ENDIAN_H
 #include <endian.h>
+#endif
 #include <string.h>
 #include <rmd160.h>