summaryrefslogtreecommitdiffstats
path: root/kex.c
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2006-03-16 05:17:05 +0100
committerTim Rice <tim@multitalents.net>2006-03-16 05:17:05 +0100
commit425a6886f99235e61faf8ea67c8f573f188eb2b2 (patch)
tree5351bc87a8e9cdc499b20b698cdbc8beb8d4ba59 /kex.c
parent - (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in (diff)
downloadopenssh-425a6886f99235e61faf8ea67c8f573f188eb2b2.tar.xz
openssh-425a6886f99235e61faf8ea67c8f573f188eb2b2.zip
- (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable
sha256 when openssl < 0.9.7. Patch from djm@. Corrections/testing by me.
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/kex.c b/kex.c
index 70c2c9709..8610a7dab 100644
--- a/kex.c
+++ b/kex.c
@@ -44,11 +44,13 @@ RCSID("$OpenBSD: kex.c,v 1.66 2006/03/07 09:07:40 djm Exp $");
#define KEX_COOKIE_LEN 16
-#ifdef HAVE_EVP_SHA256
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+# define evp_ssh_sha256() NULL
+#elif defined(HAVE_EVP_SHA256)
# define evp_ssh_sha256 EVP_sha256
-#else /* HAVE_EVP_SHA256 */
+#else
extern const EVP_MD *evp_ssh_sha256(void);
-#endif /* HAVE_EVP_SHA256 */
+#endif
/* prototype */
static void kex_kexinit_finish(Kex *);