From patchwork Mon Apr 18 20:40:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5519 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KhzMs3WWGz3x1y for ; Mon, 18 Apr 2022 20:40:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KhzMr4RV9z1Lm; Mon, 18 Apr 2022 20:40:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KhzMr3qd3z2yYx; Mon, 18 Apr 2022 20:40:24 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KhzMr0vzTz2y0t for ; Mon, 18 Apr 2022 20:40:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KhzMq0NNpzL0 for ; Mon, 18 Apr 2022 20:40:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1650314423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JGofXQWAi2vgjYKMxhUPt2J3bqIyFIXlYoHWPT0xMNY=; b=KzESjUUFThQbx17kJDq61M5WmeyTEjguG+4nkwIfCUA6ofhSW/vpq3EEclTYx1xgrz6j+m 1Lf/1pwBRlN7ehCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1650314423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JGofXQWAi2vgjYKMxhUPt2J3bqIyFIXlYoHWPT0xMNY=; b=aGd6uGvruuKbbbURB9FwOGSxWm9LOlUaOIvk0lHU6jJX+rhrhz2cgw0tBsr/382q4/5uWj y7bnf7XZNrn/UQ52dcW2l1Tk1F5NCTgMzrxIROrkDiqsZbh9eRNNCYQFfilgVwWN1UUNOD qXswP8g0NKoBv/c6auwuWc1Xg6LMXFndztLHttBzXoy4YyuNiNj3SPkB5HhNh8tjn2Gkth xRCKnxHb0MYbNzyKp+7Eb+Pd29E5aIhR+EGGC20Pc/BoImSgw7tBuHwhVP3AACzQzRsG8v 2YYQLWSJYmoHBvyCK0yVeOjYlSJc4xPHzSlvlAZvsMceY89g8nEN2XT2tuXMPw== Message-ID: Date: Mon, 18 Apr 2022 20:40:20 +0000 MIME-Version: 1.0 Subject: [PATCH 2/3] SSH: Add sntrup761x25519-sha512@openssh.com key exchange to configurations Content-Language: en-US To: development@lists.ipfire.org References: <2bd37d93-0a56-8a49-46a8-4e31afc6d582@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <2bd37d93-0a56-8a49-46a8-4e31afc6d582@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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@libssh.org,diffie-hellman-group-exchange-sha256 + KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@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@libssh.org,diffie-hellman-group-exchange-sha256 +# Only allow safe crypto algorithms +KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com