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 /sshd.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 'sshd.c')
-rw-r--r-- | sshd.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.467 2016/05/02 08:49:03 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.468 2016/05/02 10:26:04 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2637,6 +2637,9 @@ do_ssh2_kex(void) | |||
2637 | #ifdef WITH_OPENSSL | 2637 | #ifdef WITH_OPENSSL |
2638 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | 2638 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; |
2639 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; | 2639 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; |
2640 | kex->kex[KEX_DH_GRP14_SHA256] = kexdh_server; | ||
2641 | kex->kex[KEX_DH_GRP16_SHA512] = kexdh_server; | ||
2642 | kex->kex[KEX_DH_GRP18_SHA512] = kexdh_server; | ||
2640 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 2643 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
2641 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | 2644 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; |
2642 | # ifdef OPENSSL_HAS_ECC | 2645 | # ifdef OPENSSL_HAS_ECC |