diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2014-06-11 07:37:25 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2014-06-11 07:37:25 +1000 |
| commit | d7af0cc5bf273eeed0897a99420bc26841d07d8f (patch) | |
| tree | 8c58596e69adb058a139ba6df426b405f86bdbad /myproposal.h | |
| parent | 67508ac2563c33d582be181a3e777c65f549d22f (diff) | |
- (dtucker) [myprosal.h] Don't include curve25519-sha256@libssh.org in
the proposal if the version of OpenSSL we're using doesn't support ECC.
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 9 |
1 files changed, 7 insertions, 2 deletions
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" |