diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-05-02 10:26:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-05-02 20:39:32 +1000 |
commit | 0e8eeec8e75f6d0eaf33317376f773160018a9c7 (patch) | |
tree | 1fe3e4d977c9df10597c2a5dec1b6b0a8ab8afbe /myproposal.h | |
parent | 57464e3934ba53ad8590ee3ccd840f693407fc1e (diff) |
upstream commit
add support for additional fixed DH groups from
draft-ietf-curdle-ssh-kex-sha2-03
diffie-hellman-group14-sha256 (2K group)
diffie-hellman-group16-sha512 (4K group)
diffie-hellman-group18-sha512 (8K group)
based on patch from Mark D. Baushke and Darren Tucker
ok markus@
Upstream-ID: ac00406ada4f0dfec41585ca0839f039545bc46f
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/myproposal.h b/myproposal.h index bdd05966f..597090164 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -67,13 +67,18 @@ | |||
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | #ifdef HAVE_EVP_SHA256 | 69 | #ifdef HAVE_EVP_SHA256 |
70 | # define KEX_SHA256_METHODS \ | 70 | # define KEX_SHA2_METHODS \ |
71 | "diffie-hellman-group-exchange-sha256," | 71 | "diffie-hellman-group-exchange-sha256," \ |
72 | "diffie-hellman-group16-sha512," \ | ||
73 | "diffie-hellman-group18-sha512," | ||
74 | # define KEX_SHA2_GROUP14 \ | ||
75 | "diffie-hellman-group14-sha256," | ||
72 | #define SHA2_HMAC_MODES \ | 76 | #define SHA2_HMAC_MODES \ |
73 | "hmac-sha2-256," \ | 77 | "hmac-sha2-256," \ |
74 | "hmac-sha2-512," | 78 | "hmac-sha2-512," |
75 | #else | 79 | #else |
76 | # define KEX_SHA256_METHODS | 80 | # define KEX_SHA2_METHODS |
81 | # define KEX_SHA2_GROUP14 | ||
77 | # define SHA2_HMAC_MODES | 82 | # define SHA2_HMAC_MODES |
78 | #endif | 83 | #endif |
79 | 84 | ||
@@ -86,13 +91,15 @@ | |||
86 | #define KEX_COMMON_KEX \ | 91 | #define KEX_COMMON_KEX \ |
87 | KEX_CURVE25519_METHODS \ | 92 | KEX_CURVE25519_METHODS \ |
88 | KEX_ECDH_METHODS \ | 93 | KEX_ECDH_METHODS \ |
89 | KEX_SHA256_METHODS | 94 | KEX_SHA2_METHODS |
90 | 95 | ||
91 | #define KEX_SERVER_KEX KEX_COMMON_KEX \ | 96 | #define KEX_SERVER_KEX KEX_COMMON_KEX \ |
97 | KEX_SHA2_GROUP14 \ | ||
92 | "diffie-hellman-group14-sha1" \ | 98 | "diffie-hellman-group14-sha1" \ |
93 | 99 | ||
94 | #define KEX_CLIENT_KEX KEX_COMMON_KEX \ | 100 | #define KEX_CLIENT_KEX KEX_COMMON_KEX \ |
95 | "diffie-hellman-group-exchange-sha1," \ | 101 | "diffie-hellman-group-exchange-sha1," \ |
102 | KEX_SHA2_GROUP14 \ | ||
96 | "diffie-hellman-group14-sha1" | 103 | "diffie-hellman-group14-sha1" |
97 | 104 | ||
98 | #define KEX_DEFAULT_PK_ALG \ | 105 | #define KEX_DEFAULT_PK_ALG \ |