public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 3/4] OpenSSH: Add alias name for sntrup761x25519-sha512 key exchange
Date: Sat, 21 Sep 2024 15:29:59 +0000	[thread overview]
Message-ID: <20240921153000.706916-3-peter.mueller@ipfire.org> (raw)
In-Reply-To: <20240921153000.706916-1-peter.mueller@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 2102 bytes --]

This makes sure OpenSSH connections make use of this post-quantum
key exchange whenever possible, even if one peer still running
OpenSSH 9.8 or older.

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 5a9ad85c5..86f123e28 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,mlkem768x25519-sha256,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+        KexAlgorithms sntrup761x25519-sha512,sntrup761x25519-sha512(a)openssh.com,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 9229b6518..421416705 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,mlkem768x25519-sha256,curve25519-sha256,curve25519-sha256(a)libssh.org,diffie-hellman-group-exchange-sha256
+KexAlgorithms sntrup761x25519-sha512,sntrup761x25519-sha512(a)openssh.com,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


  parent reply	other threads:[~2024-09-21 15:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-21 15:29 [PATCH v2 1/4] OpenSSH :Update to 9.9p1 Peter Müller
2024-09-21 15:29 ` [PATCH v2 2/4] OpenSSH: Add ML-KEM x X25519 hybrid key exchange Peter Müller
2024-09-21 15:29 ` Peter Müller [this message]
2024-09-21 15:30 ` [PATCH v2 4/4] OpenSSH: Order symmetric ciphers by strength Peter Müller

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=20240921153000.706916-3-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