summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-12-02 14:37:18 +0100
committerDamien Miller <djm@mindrot.org>2024-12-02 14:38:18 +0100
commitd75837b9f6d0d6cc18ed5078789ea0f3dad08f00 (patch)
treec0d0c39c1d16ea39f47e5d054efbe643f1458c64
parentFix compilation with DEBUG_SK enabled (diff)
downloadopenssh-d75837b9f6d0d6cc18ed5078789ea0f3dad08f00.tar.xz
openssh-d75837b9f6d0d6cc18ed5078789ea0f3dad08f00.zip
upstream: prefer AES-GCM to AES-CTR; ok deraadt markus
OpenBSD-Commit-ID: 8366a72e0f300ee31c5dab2c95025387ec15bbc9
-rw-r--r--myproposal.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h
index cd4197641..ccaa6aa06 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.75 2024/10/25 01:34:18 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.76 2024/12/02 13:37:18 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -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