- (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in

   /usr/include/crypto.  Hint from djm@.

diff --git a/ChangeLog b/ChangeLog
index 0f0fb87c21bb5141d6677621e8926bad55fdede6..577201773faaa915d857bdade5225babe4ef6a15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20060316
  - (dtucker) [entropy.c] Add headers for WIFEXITED and friends.
+ - (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in
+   /usr/include/crypto.  Hint from djm@.
 
 20060315
  - (djm) OpenBSD CVS Sync:

diff --git a/configure.ac b/configure.ac
index 953606dc9217921c9c9522f0b3bbf78054564994..62dd8d79cfdde0ea2a0139831c141e70c2a6407c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -669,6 +669,7 @@ dnl Checks for header files.
 AC_CHECK_HEADERS( \
        bstring.h \
        crypt.h \
+       crypto/sha2.h \
        dirent.h \
        endian.h \
        features.h \

diff --git a/md-sha256.c b/md-sha256.c
index ff7f3815711fdc3d815b8af4d1344e14cc1ca996..0b1ed5828964f2726e2eabb5ddf1d0ba804ff899 100644 (file)
--- a/md-sha256.c
+++ b/md-sha256.c
@@ -22,8 +22,12 @@
 
 #include <string.h>
 #include <openssl/evp.h>
-#if defined(HAVE_SHA2_H) && defined(HAVE_SHA256_UPDATE)
-# include <sha2.h>
+#ifdef HAVE_SHA256_UPDATE
+# ifdef HAVE_SHA2_H
+#  include <sha2.h>
+# elif defined(HAVE_CRYPTO_SHA2_H)
+#  include <crypto/sha2.h>
+# endif
 #endif
 
 RCSID("$OpenBSD: md-sha256.c,v 1.1 2006/03/07 09:07:40 djm Exp $");