summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-03-30 23:13:23 +0200
committerDamien Miller <djm@mindrot.org>2022-03-30 23:16:38 +0200
commit32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba (patch)
tree23315c1d638e1b9f466cbec7c8cfe3e19b8dfa90
parentupstream: fix poll() spin when a channel's output fd closes without (diff)
downloadopenssh-32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba.tar.xz
openssh-32dc1c29a4ac9c592ddfef0a4895eb36c1f567ba.zip
upstream: select post-quantum KEX
sntrup761x25519-sha512@openssh.com as the default; ok markus@ OpenBSD-Commit-ID: f02d99cbfce22dffec2e2ab1b60905fbddf48fb9
-rw-r--r--myproposal.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/myproposal.h b/myproposal.h
index ee50d215b..ee6e9f741 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.70 2021/11/10 06:29:25 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.71 2022/03/30 21:13:23 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,12 +25,12 @@
*/
#define KEX_SERVER_KEX \
+ "sntrup761x25519-sha512@openssh.com," \
"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," \