- (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present

diff --git a/ChangeLog b/ChangeLog
index 80a078e985e43f73599654c25fc83c835e98ba96..1f5ee716dde2f19bd0f57f8f166d7900e1123219 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -249,6 +249,7 @@
    EVP_sha256 if present
  - (djm) [includes.h] Restore accidentally dropped netinet/in.h
  - (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files
+ - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)

diff --git a/configure.ac b/configure.ac
index edbf19cf9356f0b8592c5e83f4544b5716293f84..ce475c4ed54ebaf4595c8c7a9987f937be60638b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -690,6 +690,7 @@ AC_CHECK_HEADERS( \
        readpassphrase.h \
        rpc/types.h \
        security/pam_appl.h \
+       sha2.h \
        shadow.h \
        stddef.h \
        stdint.h \

diff --git a/md-sha256.c b/md-sha256.c
index 82c526d33ed9995165de95f07d824f051096818a..ff7f3815711fdc3d815b8af4d1344e14cc1ca996 100644 (file)
--- a/md-sha256.c
+++ b/md-sha256.c
@@ -20,7 +20,11 @@
 
 #ifndef HAVE_EVP_SHA256
 
+#include <string.h>
 #include <openssl/evp.h>
+#if defined(HAVE_SHA2_H) && defined(HAVE_SHA256_UPDATE)
+# include <sha2.h>
+#endif
 
 RCSID("$OpenBSD: md-sha256.c,v 1.1 2006/03/07 09:07:40 djm Exp $");