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 /myproposal.h | |
| parent | 1c8ce34909886288a3932dce770deec5449f7bb5 (diff) | |
- (dtucker) [myproposal.h] Conditionally enable CURVE25519_SHA256.
Diffstat (limited to 'myproposal.h')
| -rw-r--r-- | myproposal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index 0820749a8..56f8c4a84 100644 --- a/myproposal.h +++ b/myproposal.h | |||
| @@ -57,16 +57,19 @@ | |||
| 57 | #ifdef HAVE_EVP_SHA256 | 57 | #ifdef HAVE_EVP_SHA256 |
| 58 | # define KEX_SHA256_METHODS \ | 58 | # define KEX_SHA256_METHODS \ |
| 59 | "diffie-hellman-group-exchange-sha256," | 59 | "diffie-hellman-group-exchange-sha256," |
| 60 | #define KEX_CURVE25519_METHODS \ | ||
| 61 | "curve25519-sha256@libssh.org," | ||
| 60 | #define SHA2_HMAC_MODES \ | 62 | #define SHA2_HMAC_MODES \ |
| 61 | "hmac-sha2-256," \ | 63 | "hmac-sha2-256," \ |
| 62 | "hmac-sha2-512," | 64 | "hmac-sha2-512," |
| 63 | #else | 65 | #else |
| 64 | # define KEX_SHA256_METHODS | 66 | # define KEX_SHA256_METHODS |
| 67 | # define KEX_CURVE25519_METHODS | ||
| 65 | # define SHA2_HMAC_MODES | 68 | # define SHA2_HMAC_MODES |
| 66 | #endif | 69 | #endif |
| 67 | 70 | ||
| 68 | # define KEX_DEFAULT_KEX \ | 71 | # define KEX_DEFAULT_KEX \ |
| 69 | "curve25519-sha256@libssh.org," \ | 72 | KEX_CURVE25519_METHODS \ |
| 70 | KEX_ECDH_METHODS \ | 73 | KEX_ECDH_METHODS \ |
| 71 | KEX_SHA256_METHODS \ | 74 | KEX_SHA256_METHODS \ |
| 72 | "diffie-hellman-group-exchange-sha1," \ | 75 | "diffie-hellman-group-exchange-sha1," \ |