From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] OpenSSH: Add ML-KEM x X25519 hybrid key exchange
Date: Sat, 21 Sep 2024 13:53:46 +0000 [thread overview]
Message-ID: <20240921135346.701801-2-peter.mueller@ipfire.org> (raw)
In-Reply-To: <20240921135346.701801-1-peter.mueller@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1985 bytes --]
This was newly introduced in OpenSSH 9.9, hence our custom
configurations for both SSH server and client need to be updated.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
config/ssh/ssh_config | 2 +-
config/ssh/sshd_config | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/ssh/ssh_config b/config/ssh/ssh_config
index 85c069dda..5a9ad85c5 100644
--- a/config/ssh/ssh_config
+++ b/config/ssh/ssh_config
@@ -9,7 +9,7 @@ Host *
UseRoaming no
# Only use secure crypto algorithms
- KexAlgorithms sntrup761x25519-sha512(a)openssh.com,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+ KexAlgorithms sntrup761x25519-sha512,mlkem768x25519-sha256,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 76c9b3eb1..9229b6518 100644
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -20,7 +20,7 @@ LoginGraceTime 30s
MaxStartups 5
# Only allow safe crypto algorithms
-KexAlgorithms sntrup761x25519-sha512(a)openssh.com,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+KexAlgorithms sntrup761x25519-sha512,mlkem768x25519-sha256,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.39.5
prev parent reply other threads:[~2024-09-21 13:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 13:53 [PATCH 1/2] OpenSSH :Update to 9.9p1 Peter Müller
2024-09-21 13:53 ` Peter Müller [this message]
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=20240921135346.701801-2-peter.mueller@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