diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 10:20:12 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-21 22:07:02 +1100 |
| commit | dfd591618cdf2c96727ac0eb65f89cf54af0d97e (patch) | |
| tree | 59700563da0dc6f1de649394ffb4c787710eda5a /ssh-keyscan.c | |
| parent | b1b2ff4ed559051d1035419f8f236275fa66d5d6 (diff) | |
| download | openssh-git-dfd591618cdf2c96727ac0eb65f89cf54af0d97e.tar.gz | |
upstream: Add support for a PQC KEX/KEM:
sntrup4591761x25519-sha512@tinyssh.org using the Streamlined NTRU Prime
4591^761 implementation from SUPERCOP coupled with X25519 as a stop-loss. Not
enabled by default.
introduce KEM API; a simplified framework for DH-ish KEX methods.
from markus@ feedback & ok djm@
OpenBSD-Commit-ID: d687f76cffd3561dd73eb302d17a1c3bf321d1a7
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 88449f67..83a76870 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.120 2018/06/06 18:29:18 markus Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.121 2019/01/21 10:20:12 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -272,6 +272,7 @@ keygrab_ssh2(con *c) # endif #endif c->c_ssh->kex->kex[KEX_C25519_SHA256] = kexc25519_client; + c->c_ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client; ssh_set_verify_host_key_callback(c->c_ssh, key_print_wrapper); /* * do the key-exchange until an error occurs or until |