diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-05 15:04:00 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-05 15:04:00 +1000 |
commit | 2ea9eb77a7fcab3190564ef5a6a5377a600aa391 (patch) | |
tree | 48111c755a2686a95f68b7729b9c3fca39049b3e | |
parent | 16cac190ebb9b5612cccea63a7c22ac33bc9a07a (diff) |
- (dtucker) Enable sha256 kex methods based on the presence of the necessary
functions, not from the openssl version.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | myproposal.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20130605 | ||
2 | - (dtucker) Enable sha256 kex methods based on the presence of the necessary | ||
3 | functions, not from the openssl version. | ||
4 | |||
1 | 20130602 | 5 | 20130602 |
2 | - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy | 6 | - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy |
3 | linking regress/modpipe. | 7 | linking regress/modpipe. |
diff --git a/myproposal.h b/myproposal.h index 99d093461..f13c74850 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -46,7 +46,7 @@ | |||
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 | #ifdef HAVE_EVP_SHA256 |
50 | # define KEX_SHA256_METHODS \ | 50 | # define KEX_SHA256_METHODS \ |
51 | "diffie-hellman-group-exchange-sha256," | 51 | "diffie-hellman-group-exchange-sha256," |
52 | #else | 52 | #else |