diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-11-08 21:10:04 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-11-08 21:10:04 +1100 |
| commit | d94240b2f6b376b6e9de187e4a0cd4b89dfc48cb (patch) | |
| tree | f82b7c698203beb6057bf7b82279bcb20d2a9e44 | |
| parent | 1c8ce34909886288a3932dce770deec5449f7bb5 (diff) | |
| download | openssh-git-d94240b2f6b376b6e9de187e4a0cd4b89dfc48cb.tar.gz | |
- (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | myproposal.h | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -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 0820749a..56f8c4a8 100644 --- 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," \ |