From a624786333c43272288c3a0da2985f09c2a87d2e Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 8 Mar 2018 07:00:54 +0000 Subject: [PATCH] Add KEX method "diffie-hellman-group14-sha256". Out of the five KEX methods in RFC8268, this is the one that is completely trivial to add in PuTTY, because it only requires half a dozen lines of data declarations putting together two components we already have. draft-ietf-curdle-ssh-kex-sha2-10, if approved, will also promote it to MUST status. --- sshdh.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sshdh.c b/sshdh.c index f254bc1d..3942bd39 100644 --- a/sshdh.c +++ b/sshdh.c @@ -77,12 +77,18 @@ static const struct dh_extra extra_group14 = { P14, G, lenof(P14), lenof(G), }; +static const struct ssh_kex ssh_diffiehellman_group14_sha256 = { + "diffie-hellman-group14-sha256", "group14", + KEXTYPE_DH, &ssh_sha256, &extra_group14, +}; + static const struct ssh_kex ssh_diffiehellman_group14_sha1 = { "diffie-hellman-group14-sha1", "group14", KEXTYPE_DH, &ssh_sha1, &extra_group14, }; static const struct ssh_kex *const group14_list[] = { + &ssh_diffiehellman_group14_sha256, &ssh_diffiehellman_group14_sha1 };