summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--myproposal.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index baf445fd4..354127ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 gcc warning on platforms where it defaults to int 7 gcc warning on platforms where it defaults to int
8 - (djm) [regress/Makefile] add a few more generated files to the clean 8 - (djm) [regress/Makefile] add a few more generated files to the clean
9 target 9 target
10 - (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad
11 #define that was causing diffie-hellman-group-exchange-sha256 to be
12 incorrectly disabled
10 13
1120110212 1420110212
12 - OpenBSD CVS Sync 15 - OpenBSD CVS Sync
diff --git a/myproposal.h b/myproposal.h
index 893190788..2c43607a7 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -46,9 +46,9 @@
46#endif 46#endif
47 47
48/* Old OpenSSL doesn't support what we need for DHGEX-sha256 */ 48/* Old OpenSSL doesn't support what we need for DHGEX-sha256 */
49#if OPENSSL_VERSION_NUMBER < 0x00907000L 49#if OPENSSL_VERSION_NUMBER >= 0x00907000L
50# define KEX_SHA256_METHODS \ 50# define KEX_SHA256_METHODS \
51 "diffie-hellman-group-exchange-sha1," 51 "diffie-hellman-group-exchange-sha256,"
52#else 52#else
53# define KEX_SHA256_METHODS 53# define KEX_SHA256_METHODS
54#endif 54#endif