diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:24:09 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-21 22:08:04 +1100 |
| commit | 2f6a9ddbbf6ca8623c53c323ff17fb6d68d66970 (patch) | |
| tree | 2fe3ee7094f85e9f834d69c5d609a1b9fe886930 /ssh-keyscan.c | |
| parent | dfd591618cdf2c96727ac0eb65f89cf54af0d97e (diff) | |
upstream: use KEM API for vanilla c25519 KEX
OpenBSD-Commit-ID: 38d937b85ff770886379dd66a8f32ab0c1c35c1f
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 83a768700..9eebc1445 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssh-keyscan.c,v 1.121 2019/01/21 10:20:12 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.122 2019/01/21 10:24:09 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 | * |
| @@ -271,7 +271,7 @@ keygrab_ssh2(con *c) | |||
| 271 | c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; | 271 | c->c_ssh->kex->kex[KEX_ECDH_SHA2] = kexecdh_client; |
| 272 | # endif | 272 | # endif |
| 273 | #endif | 273 | #endif |
| 274 | c->c_ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_client; | 274 | c->c_ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client; |
| 275 | c->c_ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client; | 275 | c->c_ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client; |
| 276 | ssh_set_verify_host_key_callback(c->c_ssh, key_print_wrapper); | 276 | ssh_set_verify_host_key_callback(c->c_ssh, key_print_wrapper); |
| 277 | /* | 277 | /* |