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 /sshd.c | |
parent | b1b2ff4ed559051d1035419f8f236275fa66d5d6 (diff) |
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 'sshd.c')
-rw-r--r-- | sshd.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.527 2019/01/19 21:43:56 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.528 2019/01/21 10:20:12 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 |
@@ -2219,6 +2219,7 @@ do_ssh2_kex(struct ssh *ssh) | |||
2219 | # endif | 2219 | # endif |
2220 | #endif | 2220 | #endif |
2221 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; | 2221 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; |
2222 | kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server; | ||
2222 | kex->load_host_public_key=&get_hostkey_public_by_type; | 2223 | kex->load_host_public_key=&get_hostkey_public_by_type; |
2223 | kex->load_host_private_key=&get_hostkey_private_by_type; | 2224 | kex->load_host_private_key=&get_hostkey_private_by_type; |
2224 | kex->host_key_index=&get_hostkey_index; | 2225 | kex->host_key_index=&get_hostkey_index; |