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 /sshconnect2.c | |
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 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 1dddf75aa..945471f15 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.242 2016/05/02 08:49:03 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.243 2016/05/02 10:26:04 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -206,6 +206,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
206 | #ifdef WITH_OPENSSL | 206 | #ifdef WITH_OPENSSL |
207 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 207 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
208 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | 208 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; |
209 | kex->kex[KEX_DH_GRP14_SHA256] = kexdh_client; | ||
210 | kex->kex[KEX_DH_GRP16_SHA512] = kexdh_client; | ||
211 | kex->kex[KEX_DH_GRP18_SHA512] = kexdh_client; | ||
209 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 212 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
210 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 213 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
211 | # ifdef OPENSSL_HAS_ECC | 214 | # ifdef OPENSSL_HAS_ECC |