]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: test mlkem768x25519-sha256
authordjm@openbsd.org <djm@openbsd.org>
Mon, 9 Sep 2024 03:13:39 +0000 (03:13 +0000)
committerDamien Miller <djm@mindrot.org>
Mon, 9 Sep 2024 05:29:09 +0000 (15:29 +1000)
OpenBSD-Regress-ID: 7baf6bc39ae55648db1a2bfdc55a624954847611

regress/unittests/kex/Makefile
regress/unittests/kex/test_kex.c

index 3c898408f192ec50fff50bddfef0d7b2b4e431b7..ca4f0ee38639109450f577ab6e739c5e430fce20 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.15 2024/05/19 19:10:01 anton Exp $
+#      $OpenBSD: Makefile,v 1.16 2024/09/09 03:13:39 djm Exp $
 
 PROG=test_kex
 SRCS=tests.c test_kex.c test_proposal.c
@@ -25,6 +25,7 @@ SRCS+=        kexc25519.c
 SRCS+= smult_curve25519_ref.c
 SRCS+= kexgen.c
 SRCS+= kexsntrup761x25519.c
+SRCS+= kexmlkem768x25519.c
 SRCS+= sntrup761.c
 SRCS+= utf8.c
 
index b1161ea824fa9d05a6dd705b7445d0ba02627887..9476ce6869ea6d79bcaf4a8b7468d64a25477c1b 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: test_kex.c,v 1.8 2024/03/25 19:28:09 djm Exp $ */
+/*     $OpenBSD: test_kex.c,v 1.9 2024/09/09 03:13:39 djm Exp $ */
 /*
  * Regress test KEX
  *
@@ -153,6 +153,7 @@ do_kex_with_key(char *kex, int keytype, int bits)
 #endif /* WITH_OPENSSL */
        server2->kex->kex[KEX_C25519_SHA256] = kex_gen_server;
        server2->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server;
+       server2->kex->kex[KEX_KEM_MLKEM768X25519_SHA256] = kex_gen_server;
        server2->kex->load_host_public_key = server->kex->load_host_public_key;
        server2->kex->load_host_private_key = server->kex->load_host_private_key;
        server2->kex->sign = server->kex->sign;
@@ -208,6 +209,7 @@ kex_tests(void)
        do_kex("diffie-hellman-group14-sha1");
        do_kex("diffie-hellman-group1-sha1");
 # ifdef USE_SNTRUP761X25519
+       do_kex("mlkem768x25519-sha256");
        do_kex("sntrup761x25519-sha512@openssh.com");
 # endif /* USE_SNTRUP761X25519 */
 #endif /* WITH_OPENSSL */