summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2021-11-10 06:29:25 +0000
committerDamien Miller <djm@mindrot.org>2021-11-10 17:32:18 +1100
commit21b6b5a06c8c53c548d25e6074c5240e88e2ef34 (patch)
tree3c47c90e633482e959d84f3c8c2dc5478687b644 /ssh_config.5
parent239da797cbf07a640d7b1ea02d3f99ace3ef792d (diff)
downloadopenssh-git-21b6b5a06c8c53c548d25e6074c5240e88e2ef34.tar.gz
upstream: add the sntrup761x25519-sha512@openssh.com hybrid
ECDH/x25519 + Streamlined NTRU Prime post-quantum KEX to the default KEXAlgorithms list (after the ECDH methods but before the prime-group DH ones). ok markus@ OpenBSD-Commit-ID: 22b77e27a04e497a10e22f138107579652854210
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.55
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 170125a0..dd223a84 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.366 2021/09/25 09:40:33 kn Exp $
-.Dd $Mdocdate: September 25 2021 $
+.\" $OpenBSD: ssh_config.5,v 1.367 2021/11/10 06:29:25 djm Exp $
+.Dd $Mdocdate: November 10 2021 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1167,6 +1167,7 @@ The default is:
.Bd -literal -offset indent
curve25519-sha256,curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
+sntrup761x25519-sha512@openssh.com,
diffie-hellman-group-exchange-sha256,
diffie-hellman-group16-sha512,
diffie-hellman-group18-sha512,