From 9b16086e74c5df0b213bd871be6bee3c04c98f87 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 13 Jan 2011 22:00:20 +1100 Subject: [PATCH] - (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad #define that was causing diffie-hellman-group-exchange-sha256 to be incorrectly disabled --- ChangeLog | 3 +++ myproposal.h | 4 ++-- 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 @@ gcc warning on platforms where it defaults to int - (djm) [regress/Makefile] add a few more generated files to the clean target + - (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad + #define that was causing diffie-hellman-group-exchange-sha256 to be + incorrectly disabled 20110212 - 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 @@ #endif /* Old OpenSSL doesn't support what we need for DHGEX-sha256 */ -#if OPENSSL_VERSION_NUMBER < 0x00907000L +#if OPENSSL_VERSION_NUMBER >= 0x00907000L # define KEX_SHA256_METHODS \ - "diffie-hellman-group-exchange-sha1," + "diffie-hellman-group-exchange-sha256," #else # define KEX_SHA256_METHODS #endif