diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | myproposal.h | 9 |
2 files changed, 9 insertions, 2 deletions
@@ -2,6 +2,8 @@ | |||
2 | - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c | 2 | - (dtucker) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c |
3 | regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256 | 3 | regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c] Only do NISTP256 |
4 | curve tests if OpenSSL has them. | 4 | curve tests if OpenSSL has them. |
5 | - (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in | ||
6 | the proposal if the version of OpenSSL we're using doesn't support ECC. | ||
5 | 7 | ||
6 | 20140527 | 8 | 20140527 |
7 | - (djm) [cipher.c] Fix merge botch. | 9 | - (djm) [cipher.c] Fix merge botch. |
diff --git a/myproposal.h b/myproposal.h index 30cb20b44..d42988996 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -78,8 +78,13 @@ | |||
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | #ifdef WITH_OPENSSL | 80 | #ifdef WITH_OPENSSL |
81 | #define KEX_SERVER_KEX \ | 81 | # ifdef OPENSSL_HAS_ECC |
82 | "curve25519-sha256@libssh.org," \ | 82 | # define KEX_CURVE25519_METHODS "curve25519-sha256@libssh.org," |
83 | # else | ||
84 | # define KEX_CURVE25519_METHODS "" | ||
85 | # endif | ||
86 | #define KEX_SERVER_KEX \ | ||
87 | KEX_CURVE25519_METHODS \ | ||
83 | KEX_ECDH_METHODS \ | 88 | KEX_ECDH_METHODS \ |
84 | KEX_SHA256_METHODS \ | 89 | KEX_SHA256_METHODS \ |
85 | "diffie-hellman-group14-sha1" | 90 | "diffie-hellman-group14-sha1" |