diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-13 22:00:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-13 22:00:20 +1100 |
commit | 9b16086e74c5df0b213bd871be6bee3c04c98f87 (patch) | |
tree | 9f8ddbc80d580fd2b8d5babdf2d7c2a47ad61f06 | |
parent | cbaf8e6ec17ceceb488eed578a11f3ab73264a1e (diff) |
- (djm) [myproposal.h] Fix reversed OPENSSL_VERSION_NUMBER test and bad
#define that was causing diffie-hellman-group-exchange-sha256 to be
incorrectly disabled
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | myproposal.h | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -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 | ||
11 | 20110212 | 14 | 20110212 |
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 |