diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:28:01 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 22:08:47 +1100 |
commit | 9c9c97e14fe190931f341876ad98213e1e1dc19f (patch) | |
tree | 079c12ccb4e1538928872d4bc5623727119291e2 /ssh-keyscan.c | |
parent | 2f6a9ddbbf6ca8623c53c323ff17fb6d68d66970 (diff) |
upstream: use KEM API for vanilla DH KEX
from markus@ ok djm@
OpenBSD-Commit-ID: af56466426b08a8be275412ae2743319e3d277c9
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r-- | ssh-keyscan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 9eebc1445..3d2760056 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keyscan.c,v 1.122 2019/01/21 10:24:09 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.123 2019/01/21 10:28:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
4 | * | 4 | * |
@@ -260,11 +260,11 @@ keygrab_ssh2(con *c) | |||
260 | exit(1); | 260 | exit(1); |
261 | } | 261 | } |
262 | #ifdef WITH_OPENSSL | 262 | #ifdef WITH_OPENSSL |
263 | c->c_ssh->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 263 | c->c_ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_client; |
264 | c->c_ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | 264 | c->c_ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_client; |
265 | c->c_ssh->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_client; | 265 | c->c_ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_client; |
266 | c->c_ssh->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_client; | 266 | c->c_ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_client; |
267 | c->c_ssh->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_client; | 267 | c->c_ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_client; |
268 | c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 268 | c->c_ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
269 | c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 269 | c->c_ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
270 | # ifdef OPENSSL_HAS_ECC | 270 | # ifdef OPENSSL_HAS_ECC |