summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2013-06-05 05:04:00 +0000
committerdtucker <dtucker>2013-06-05 05:04:00 +0000
commitd2452b785acbd9448e9f4b7e3be190215e9d4752 (patch)
treee1b1d98d3bc87123e434e875f6983aa4c238d4b4
parent64f0f0c944b4c97147144769c7bf050c7f25e96f (diff)
downloadopenssh-d2452b785acbd9448e9f4b7e3be190215e9d4752.tar.gz
- (dtucker) Enable sha256 kex methods based on the presence of the necessary
functions, not from the openssl version.
-rw-r--r--ChangeLog4
-rw-r--r--myproposal.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 555fede3..ad5b66a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20130605
+ - (dtucker) Enable sha256 kex methods based on the presence of the necessary
+ functions, not from the openssl version.
+
20130602
- (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
linking regress/modpipe.
diff --git a/myproposal.h b/myproposal.h
index 99d09346..f13c7485 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -46,7 +46,7 @@
#endif
/* Old OpenSSL doesn't support what we need for DHGEX-sha256 */
-#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+#ifdef HAVE_EVP_SHA256
# define KEX_SHA256_METHODS \
"diffie-hellman-group-exchange-sha256,"
#else