- (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.

diff --git a/ChangeLog b/ChangeLog
index 1c2362461c42b134fae67384c84d9c5ca3e739d3..e7d934fdbb3b0e5535577305d7d2631a14f6580c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
    arc4random_stir (right now this is only OpenBSD -current).
  - (dtucker) [kex.c] Only enable CURVE25519_SHA256 if we actually have
    EVP_sha256.
+ - (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.
 
 20131107
  - (djm) [ssh-pkcs11.c] Bring back "non-constant initialiser" fix (rev 1.5)

diff --git a/myproposal.h b/myproposal.h
index 0820749a82fafa1366fb7f6f7ff654dc233ef17f..56f8c4a842b88a290298214222866d3dea450f3e 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -57,16 +57,19 @@
 #ifdef HAVE_EVP_SHA256
 # define KEX_SHA256_METHODS \
        "diffie-hellman-group-exchange-sha256,"
+#define KEX_CURVE25519_METHODS \
+       "curve25519-sha256@libssh.org,"
 #define        SHA2_HMAC_MODES \
        "hmac-sha2-256," \
        "hmac-sha2-512,"
 #else
 # define KEX_SHA256_METHODS
+# define KEX_CURVE25519_METHODS
 # define SHA2_HMAC_MODES
 #endif
 
 # define KEX_DEFAULT_KEX \
-       "curve25519-sha256@libssh.org," \
+       KEX_CURVE25519_METHODS \
        KEX_ECDH_METHODS \
        KEX_SHA256_METHODS \
        "diffie-hellman-group-exchange-sha1," \