[openssh-commits] [openssh] 02/03: upstream: benchmark more diffie-hellman-group* KEXs

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit c357c4a1e626feba9a968b5f0cb832b989b2d433
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Thu Aug 21 05:55:30 2025 +0000

    upstream: benchmark more diffie-hellman-group* KEXs
    
    use current KEX names, i.e. remove the "@openssh.com" where the KEX
    has been standardised
    
    OpenBSD-Regress-ID: a67e9da4efd9a971d39cb2481093f836046f9b7f
---
 regress/unittests/kex/test_kex.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index 54b826239..0c33e80f8 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: test_kex.c,v 1.11 2025/05/06 06:05:48 djm Exp $ */
+/* 	$OpenBSD: test_kex.c,v 1.12 2025/08/21 05:55:30 djm Exp $ */
 /*
  * Regress test KEX
  *
@@ -162,6 +162,9 @@ do_kex_with_key(char *kex, char *cipher, char *mac,
 	server2->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
 	server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
 	server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
+	server2->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
+	server2->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
+	server2->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
 #ifdef OPENSSL_HAS_ECC
 	server2->kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 #endif /* OPENSSL_HAS_ECC */
@@ -228,7 +231,7 @@ do_kex(char *kex)
 void
 kex_tests(void)
 {
-	do_kex("curve25519-sha256 at libssh.org");
+	do_kex("curve25519-sha256");
 #ifdef WITH_OPENSSL
 #ifdef OPENSSL_HAS_ECC
 	do_kex("ecdh-sha2-nistp256");
@@ -239,11 +242,16 @@ kex_tests(void)
 	do_kex("diffie-hellman-group-exchange-sha1");
 	do_kex("diffie-hellman-group14-sha1");
 	do_kex("diffie-hellman-group1-sha1");
+	if (test_is_benchmark()) {
+		do_kex("diffie-hellman-group14-sha256");
+		do_kex("diffie-hellman-group16-sha512");
+		do_kex("diffie-hellman-group18-sha512");
+	}
 # ifdef USE_MLKEM768X25519
 	do_kex("mlkem768x25519-sha256");
 # endif /* USE_MLKEM768X25519 */
 # ifdef USE_SNTRUP761X25519
-	do_kex("sntrup761x25519-sha512 at openssh.com");
+	do_kex("sntrup761x25519-sha512");
 # endif /* USE_SNTRUP761X25519 */
 #endif /* WITH_OPENSSL */
 }

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