summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac5
-rw-r--r--md-sha256.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fbdf12179..be1030f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -249,6 +249,7 @@
249 EVP_sha256 if present 249 EVP_sha256 if present
250 - (djm) [includes.h] Restore accidentally dropped netinet/in.h 250 - (djm) [includes.h] Restore accidentally dropped netinet/in.h
251 - (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files 251 - (djm) [Makefile.in openbsd-compat/Makefile.in] Add added files
252 - (djm) [md-sha256.c configure.ac] md-sha256.c needs sha2.h if present
252 253
25320060313 25420060313
254 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 255 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4150,4 +4151,4 @@
4150 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4151 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4151 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4152 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4152 4153
4153$Id: ChangeLog,v 1.4210 2006/03/15 02:09:18 djm Exp $ 4154$Id: ChangeLog,v 1.4211 2006/03/15 02:12:41 djm Exp $
diff --git a/configure.ac b/configure.ac
index 160493f06..fc54f3b54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.334 2006/03/15 02:02:28 djm Exp $ 1# $Id: configure.ac,v 1.335 2006/03/15 02:12:41 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.334 $) 18AC_REVISION($Revision: 1.335 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -690,6 +690,7 @@ AC_CHECK_HEADERS( \
690 readpassphrase.h \ 690 readpassphrase.h \
691 rpc/types.h \ 691 rpc/types.h \
692 security/pam_appl.h \ 692 security/pam_appl.h \
693 sha2.h \
693 shadow.h \ 694 shadow.h \
694 stddef.h \ 695 stddef.h \
695 stdint.h \ 696 stdint.h \
diff --git a/md-sha256.c b/md-sha256.c
index 82c526d33..ff7f38157 100644
--- a/md-sha256.c
+++ b/md-sha256.c
@@ -20,7 +20,11 @@
20 20
21#ifndef HAVE_EVP_SHA256 21#ifndef HAVE_EVP_SHA256
22 22
23#include <string.h>
23#include <openssl/evp.h> 24#include <openssl/evp.h>
25#if defined(HAVE_SHA2_H) && defined(HAVE_SHA256_UPDATE)
26# include <sha2.h>
27#endif
24 28
25RCSID("$OpenBSD: md-sha256.c,v 1.1 2006/03/07 09:07:40 djm Exp $"); 29RCSID("$OpenBSD: md-sha256.c,v 1.1 2006/03/07 09:07:40 djm Exp $");
26 30