diff options
| author | djm <djm> | 2011-01-13 11:00:20 +0000 |
|---|---|---|
| committer | djm <djm> | 2011-01-13 11:00:20 +0000 |
| commit | aad94c69b5f38b384f7fc9db31224a7e71aee485 (patch) | |
| tree | 36050144a3c3948fdde755e8616b0e0e2f9ce5be | |
| parent | cb7b95c7778c96896d7847b5b6a04e13580b09a0 (diff) | |
| download | openssh-aad94c69b5f38b384f7fc9db31224a7e71aee485.tar.gz | |
- (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 @@ 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 89319078..2c43607a 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 |