[openssh-commits] [openssh] 02/02: upstream: remove mlkem768brainpoolp256r1-sha256; requested by

git+noreply at mindrot.org git+noreply at mindrot.org
Sat Aug 8 17:35:14 AEST 2026


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 05ec77c14b9143b4d49f05a8dcd1366a92b9024e
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Sat Aug 8 07:27:54 2026 +0000

    upstream: remove mlkem768brainpoolp256r1-sha256; requested by
    
    markus
    
    OpenBSD-Commit-ID: 0fcb5943abe5476e42983dcfc4c400e39e5db6a7
---
 kex-names.c   | 6 +-----
 kex.h         | 3 +--
 sshd_config.5 | 6 ++----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/kex-names.c b/kex-names.c
index 225efb0dc..116150316 100644
--- a/kex-names.c
+++ b/kex-names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex-names.c,v 1.9 2026/07/27 12:31:09 markus Exp $ */
+/* $OpenBSD: kex-names.c,v 1.10 2026/08/08 07:27:54 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -69,10 +69,6 @@ static const struct kexalg kexalgs[] = {
 	    SSH_DIGEST_SHA512, KEX_NOT_PQ },
 	{ KEX_MLKEM768NISTP256_SHA256, KEX_KEM_MLKEM768ECDH_SHA256,
 	    NID_X9_62_prime256v1, SSH_DIGEST_SHA256, KEX_IS_PQ },
-# ifdef USE_BRAINPOOLP256R1
-	{ KEX_MLKEM768BRAINPOOLP256R1_SHA256, KEX_KEM_MLKEM768ECDH_SHA256,
-	    NID_brainpoolP256r1, SSH_DIGEST_SHA256, KEX_IS_PQ },
-# endif /* USE_BRAINPOOLP256R1 */
 #endif /* WITH_OPENSSL */
 #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL)
 	{ KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256, KEX_NOT_PQ },
diff --git a/kex.h b/kex.h
index 3ce1c3328..9816b1d83 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.133 2026/08/03 06:43:16 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.134 2026/08/08 07:27:54 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -59,7 +59,6 @@
 #define	KEX_SNTRUP761X25519_SHA512_OLD	"sntrup761x25519-sha512 at openssh.com"
 #define	KEX_MLKEM768X25519_SHA256	"mlkem768x25519-sha256"
 #define	KEX_MLKEM768NISTP256_SHA256	"mlkem768nistp256-sha256"
-#define	KEX_MLKEM768BRAINPOOLP256R1_SHA256 "mlkem768brainpoolp256r1-sha256"
 
 #define COMP_NONE	0
 #define COMP_DELAYED	2
diff --git a/sshd_config.5 b/sshd_config.5
index 80938d2f5..a7d300139 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.401 2026/08/04 22:14:52 naddy Exp $
-.Dd $Mdocdate: August 4 2026 $
+.\" $OpenBSD: sshd_config.5,v 1.402 2026/08/08 07:27:54 djm Exp $
+.Dd $Mdocdate: August 8 2026 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1083,8 +1083,6 @@ ecdh-sha2-nistp384
 .It
 ecdh-sha2-nistp521
 .It
-mlkem768brainpoolp256r1-sha256
-.It
 mlkem768nistp256-sha256
 .It
 mlkem768x25519-sha256

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list