From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] SSH: Add sntrup761x25519-sha512@openssh.com key exchange to configurations
Date: Mon, 18 Apr 2022 20:40:20 +0000 [thread overview]
Message-ID: <a0fdac73-2eea-f2b2-3756-2ce83c80481c@ipfire.org> (raw)
In-Reply-To: <2bd37d93-0a56-8a49-46a8-4e31afc6d582@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2053 bytes --]
This algorithm was introduced in OpenSSH 9.0p1; also, align the
curve25519-sha256* key exchanges to keep things tidy.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
config/ssh/ssh_config | 2 +-
config/ssh/sshd_config | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config
index 2e2ee60c3..ee0954d5c 100644
--- a/config/ssh/ssh_config
+++ b/config/ssh/ssh_config
@@ -9,7 +9,7 @@ Host *
UseRoaming no
# Only use secure crypto algorithms
- KexAlgorithms curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+ KexAlgorithms sntrup761x25519-sha512(a)openssh.com,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
Ciphers chacha20-poly1305(a)openssh.com,aes256-gcm(a)openssh.com,aes128-gcm(a)openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
MACs hmac-sha2-512-etm(a)openssh.com,hmac-sha2-256-etm(a)openssh.com,umac-128-etm(a)openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128(a)openssh.com
diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index bea5cee53..456556540 100644
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -19,9 +19,8 @@ LoginGraceTime 30s
# Limit maximum instanctes to prevent DoS
MaxStartups 5
-# Only allow safe crypto algorithms (may break some _very_ outdated clients)
-# See also: https://stribika.github.io/2015/01/04/secure-secure-shell.html
-KexAlgorithms curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+# Only allow safe crypto algorithms
+KexAlgorithms sntrup761x25519-sha512(a)openssh.com,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
Ciphers chacha20-poly1305(a)openssh.com,aes256-gcm(a)openssh.com,aes128-gcm(a)openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
MACs hmac-sha2-512-etm(a)openssh.com,hmac-sha2-256-etm(a)openssh.com,umac-128-etm(a)openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128(a)openssh.com
--
2.34.1
next prev parent reply other threads:[~2022-04-18 20:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-18 20:40 [PATCH 1/3] OpenSSH: Update to 9.0p1 Peter Müller
2022-04-18 20:40 ` Peter Müller [this message]
2022-04-18 20:40 ` [PATCH 3/3] SSH: do not send spoofable TCP keep alive messages Peter Müller
2022-04-19 10:17 ` Michael Tremer
2022-04-19 10:40 ` Peter Müller
2022-04-19 10:41 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a0fdac73-2eea-f2b2-3756-2ce83c80481c@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox