summaryrefslogtreecommitdiff
path: root/myproposal.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-06-11 07:37:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-06-11 07:37:25 +1000
commitd7af0cc5bf273eeed0897a99420bc26841d07d8f (patch)
tree8c58596e69adb058a139ba6df426b405f86bdbad /myproposal.h
parent67508ac2563c33d582be181a3e777c65f549d22f (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.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h
index 30cb20b4..d4298899 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -78,8 +78,13 @@
#endif
#ifdef WITH_OPENSSL
-#define KEX_SERVER_KEX \
- "curve25519-sha256@libssh.org," \
+# ifdef OPENSSL_HAS_ECC
+# define KEX_CURVE25519_METHODS "curve25519-sha256@libssh.org,"
+# else
+# define KEX_CURVE25519_METHODS ""
+# endif
+#define KEX_SERVER_KEX \
+ KEX_CURVE25519_METHODS \
KEX_ECDH_METHODS \
KEX_SHA256_METHODS \
"diffie-hellman-group14-sha1"