aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/myproposal.h
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssh/myproposal.h')
-rw-r--r--crypto/openssh/myproposal.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/openssh/myproposal.h b/crypto/openssh/myproposal.h
index 3bdc2e955535..8fe9276c21f9 100644
--- a/crypto/openssh/myproposal.h
+++ b/crypto/openssh/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.73 2024/09/09 02:39:57 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.77 2024/12/02 14:06:42 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,21 +25,21 @@
*/
#define KEX_SERVER_KEX \
+ "mlkem768x25519-sha256," \
"sntrup761x25519-sha512," \
"sntrup761x25519-sha512@openssh.com," \
- "mlkem768x25519-sha256," \
"curve25519-sha256," \
"curve25519-sha256@libssh.org," \
"ecdh-sha2-nistp256," \
"ecdh-sha2-nistp384," \
- "ecdh-sha2-nistp521," \
+ "ecdh-sha2-nistp521" \
+
+#define KEX_CLIENT_KEX KEX_SERVER_KEX "," \
"diffie-hellman-group-exchange-sha256," \
"diffie-hellman-group16-sha512," \
"diffie-hellman-group18-sha512," \
"diffie-hellman-group14-sha256"
-#define KEX_CLIENT_KEX KEX_SERVER_KEX
-
#define KEX_DEFAULT_PK_ALG \
"ssh-ed25519-cert-v01@openssh.com," \
"ecdsa-sha2-nistp256-cert-v01@openssh.com," \
@@ -60,8 +60,8 @@
#define KEX_SERVER_ENCRYPT \
"chacha20-poly1305@openssh.com," \
- "aes128-ctr,aes192-ctr,aes256-ctr," \
- "aes128-gcm@openssh.com,aes256-gcm@openssh.com"
+ "aes128-gcm@openssh.com,aes256-gcm@openssh.com," \
+ "aes128-ctr,aes192-ctr,aes256-ctr"
#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT