aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2024-12-26 00:28:23 -0700
committerTheo Buehler <tb@openbsd.org>2024-12-26 00:58:32 -0700
commit4e0552995fa2a9864157a7b2a62462363e8c10bd (patch)
tree29d6d6e8f37d78c3fac489a3c512b3842f3b61c2 /tests
parent3de45b06b8a7df0f146ab8fc5cc4eeffa4825160 (diff)
downloadportable-4e0552995fa2a9864157a7b2a62462363e8c10bd.tar.gz
portable-4e0552995fa2a9864157a7b2a62462363e8c10bd.tar.bz2
portable-4e0552995fa2a9864157a7b2a62462363e8c10bd.zip
Adjust the ML-KEM tests to recent reorganization
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt86
-rw-r--r--tests/Makefile.am88
-rwxr-xr-xtests/mlkem1024_decap_tests.sh12
-rwxr-xr-xtests/mlkem1024_encap_tests.sh12
-rwxr-xr-xtests/mlkem1024_keygen_tests.sh12
-rwxr-xr-xtests/mlkem1024_nist_decap_tests.sh12
-rwxr-xr-xtests/mlkem1024_nist_keygen_tests.sh12
-rwxr-xr-xtests/mlkem768_decap_tests.sh12
-rwxr-xr-xtests/mlkem768_encap_tests.sh12
-rwxr-xr-xtests/mlkem768_keygen_tests.sh12
-rwxr-xr-xtests/mlkem768_nist_decap_tests.sh12
-rwxr-xr-xtests/mlkem768_nist_keygen_tests.sh12
-rwxr-xr-xtests/mlkem_tests.sh22
13 files changed, 52 insertions, 264 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2639ee6..ba8444e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -537,77 +537,21 @@ add_executable(md_test md_test.c)
537target_link_libraries(md_test ${OPENSSL_TEST_LIBS}) 537target_link_libraries(md_test ${OPENSSL_TEST_LIBS})
538add_platform_test(md_test md_test) 538add_platform_test(md_test md_test)
539 539
540# mlkem1024_decap_tests 540# mlkem_tests
541add_executable(mlkem1024_decap_tests mlkem1024_decap_tests.c mlkem_tests_util.c) 541add_executable(mlkem_tests mlkem_tests.c mlkem_tests_util.c parse_test_file.c)
542target_link_libraries(mlkem1024_decap_tests ${OPENSSL_TEST_LIBS}) 542target_link_libraries(mlkem_tests ${OPENSSL_TEST_LIBS})
543prepare_emscripten_test_target(mlkem1024_decap_tests) 543prepare_emscripten_test_target(mlkem_tests)
544add_platform_test(mlkem1024_decap_tests mlkem1024_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_decap_tests.txt) 544if(NOT WIN32)
545 545 add_test(NAME mlkem_tests COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mlkem_tests.sh)
546# mlkem1024_encap_tests 546 set_tests_properties(mlkem_tests PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
547add_executable(mlkem1024_encap_tests mlkem1024_encap_tests.c mlkem_tests_util.c) 547endif()
548target_link_libraries(mlkem1024_encap_tests ${OPENSSL_TEST_LIBS}) 548# XXX - add tests for Windows
549prepare_emscripten_test_target(mlkem1024_encap_tests) 549
550add_platform_test(mlkem1024_encap_tests mlkem1024_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_encap_tests.txt) 550# mlkem_iteration_tests
551 551add_executable(mlkem_iteration_tests mlkem_iteration_tests.c mlkem_tests_util.c)
552# mlkem1024_iteration_test 552target_link_libraries(mlkem_iteration_tests ${OPENSSL_TEST_LIBS})
553add_executable(mlkem1024_iteration_test mlkem1024_iteration_test.c mlkem_tests_util.c) 553prepare_emscripten_test_target(mlkem_iteration_tests)
554target_link_libraries(mlkem1024_iteration_test ${OPENSSL_TEST_LIBS}) 554add_platform_test(mlkem_iteration_tests mlkem_iteration_tests)
555prepare_emscripten_test_target(mlkem1024_iteration_test)
556add_platform_test(mlkem1024_iteration_test mlkem1024_iteration_test)
557
558# mlkem1024_keygen_tests
559add_executable(mlkem1024_keygen_tests mlkem1024_keygen_tests.c mlkem_tests_util.c)
560target_link_libraries(mlkem1024_keygen_tests ${OPENSSL_TEST_LIBS})
561prepare_emscripten_test_target(mlkem1024_keygen_tests)
562add_platform_test(mlkem1024_keygen_tests mlkem1024_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_keygen_tests.txt)
563
564# mlkem1024_nist_decap_tests
565add_executable(mlkem1024_nist_decap_tests mlkem1024_nist_decap_tests.c mlkem_tests_util.c)
566target_link_libraries(mlkem1024_nist_decap_tests ${OPENSSL_TEST_LIBS})
567prepare_emscripten_test_target(mlkem1024_nist_decap_tests)
568add_platform_test(mlkem1024_nist_decap_tests mlkem1024_nist_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_nist_decap_tests.txt)
569
570# mlkem1024_nist_keygen_tests
571add_executable(mlkem1024_nist_keygen_tests mlkem1024_nist_keygen_tests.c mlkem_tests_util.c)
572target_link_libraries(mlkem1024_nist_keygen_tests ${OPENSSL_TEST_LIBS})
573prepare_emscripten_test_target(mlkem1024_nist_keygen_tests)
574add_platform_test(mlkem1024_nist_keygen_tests mlkem1024_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_nist_keygen_tests.txt)
575
576# mlkem768_decap_tests
577add_executable(mlkem768_decap_tests mlkem768_decap_tests.c mlkem_tests_util.c)
578target_link_libraries(mlkem768_decap_tests ${OPENSSL_TEST_LIBS})
579prepare_emscripten_test_target(mlkem768_decap_tests)
580add_platform_test(mlkem768_decap_tests mlkem768_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_decap_tests.txt)
581
582# mlkem768_encap_tests
583add_executable(mlkem768_encap_tests mlkem768_encap_tests.c mlkem_tests_util.c)
584target_link_libraries(mlkem768_encap_tests ${OPENSSL_TEST_LIBS})
585prepare_emscripten_test_target(mlkem768_encap_tests)
586add_platform_test(mlkem768_encap_tests mlkem768_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_encap_tests.txt)
587
588# mlkem768_iteration_test
589add_executable(mlkem768_iteration_test mlkem768_iteration_test.c mlkem_tests_util.c)
590target_link_libraries(mlkem768_iteration_test ${OPENSSL_TEST_LIBS})
591prepare_emscripten_test_target(mlkem768_iteration_test)
592add_platform_test(mlkem768_iteration_test mlkem768_iteration_test)
593
594# mlkem768_keygen_tests
595add_executable(mlkem768_keygen_tests mlkem768_keygen_tests.c mlkem_tests_util.c)
596target_link_libraries(mlkem768_keygen_tests ${OPENSSL_TEST_LIBS})
597prepare_emscripten_test_target(mlkem768_keygen_tests)
598add_platform_test(mlkem768_keygen_tests mlkem768_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_keygen_tests.txt)
599
600# mlkem768_nist_decap_tests
601add_executable(mlkem768_nist_decap_tests mlkem768_nist_decap_tests.c mlkem_tests_util.c)
602target_link_libraries(mlkem768_nist_decap_tests ${OPENSSL_TEST_LIBS})
603prepare_emscripten_test_target(mlkem768_nist_decap_tests)
604add_platform_test(mlkem768_nist_decap_tests mlkem768_nist_decap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_decap_tests.txt)
605
606# mlkem768_nist_keygen_tests
607add_executable(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests.c mlkem_tests_util.c)
608target_link_libraries(mlkem768_nist_keygen_tests ${OPENSSL_TEST_LIBS})
609prepare_emscripten_test_target(mlkem768_nist_keygen_tests)
610add_platform_test(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_keygen_tests.txt)
611 555
612# mlkem_unittest 556# mlkem_unittest
613add_executable(mlkem_unittest mlkem_unittest.c mlkem_tests_util.c) 557add_executable(mlkem_unittest mlkem_unittest.c mlkem_tests_util.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e5d3bec..55f0b70 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -546,86 +546,28 @@ check_PROGRAMS += md_test
546md_test_SOURCES = md_test.c 546md_test_SOURCES = md_test.c
547 547
548noinst_HEADERS += mlkem_tests_util.h 548noinst_HEADERS += mlkem_tests_util.h
549noinst_HEADERS += parse_test_file.h
549 550
550# mlkem1024_decap_tests 551# mlkem_tests
551TESTS += mlkem1024_decap_tests.sh 552TESTS += mlkem_tests.sh
552check_PROGRAMS += mlkem1024_decap_tests 553check_PROGRAMS += mlkem_tests
553mlkem1024_decap_tests_SOURCES = mlkem1024_decap_tests.c mlkem_tests_util.c 554mlkem_tests_SOURCES = mlkem_tests.c mlkem_tests_util.c parse_test_file.c
554EXTRA_DIST += mlkem1024_decap_tests.sh 555EXTRA_DIST += mlkem_tests.sh
556EXTRA_DIST += mlkem768_decap_tests.txt
557EXTRA_DIST += mlkem768_encap_tests.txt
558EXTRA_DIST += mlkem768_keygen_tests.txt
559EXTRA_DIST += mlkem768_nist_decap_tests.txt
560EXTRA_DIST += mlkem768_nist_keygen_tests.txt
555EXTRA_DIST += mlkem1024_decap_tests.txt 561EXTRA_DIST += mlkem1024_decap_tests.txt
556
557# mlkem1024_encap_tests
558TESTS += mlkem1024_encap_tests.sh
559check_PROGRAMS += mlkem1024_encap_tests
560mlkem1024_encap_tests_SOURCES = mlkem1024_encap_tests.c mlkem_tests_util.c
561EXTRA_DIST += mlkem1024_encap_tests.sh
562EXTRA_DIST += mlkem1024_encap_tests.txt 562EXTRA_DIST += mlkem1024_encap_tests.txt
563
564# mlkem1024_iteration_test
565TESTS += mlkem1024_iteration_test
566check_PROGRAMS += mlkem1024_iteration_test
567mlkem1024_iteration_test_SOURCES = mlkem1024_iteration_test.c mlkem_tests_util.c
568
569# mlkem1024_keygen_tests
570TESTS += mlkem1024_keygen_tests.sh
571check_PROGRAMS += mlkem1024_keygen_tests
572mlkem1024_keygen_tests_SOURCES = mlkem1024_keygen_tests.c mlkem_tests_util.c
573EXTRA_DIST += mlkem1024_keygen_tests.sh
574EXTRA_DIST += mlkem1024_keygen_tests.txt 563EXTRA_DIST += mlkem1024_keygen_tests.txt
575
576# mlkem1024_nist_decap_tests
577TESTS += mlkem1024_nist_decap_tests.sh
578check_PROGRAMS += mlkem1024_nist_decap_tests
579mlkem1024_nist_decap_tests_SOURCES = mlkem1024_nist_decap_tests.c mlkem_tests_util.c
580EXTRA_DIST += mlkem1024_nist_decap_tests.sh
581EXTRA_DIST += mlkem1024_nist_decap_tests.txt 564EXTRA_DIST += mlkem1024_nist_decap_tests.txt
582
583# mlkem1024_nist_keygen_tests
584TESTS += mlkem1024_nist_keygen_tests.sh
585check_PROGRAMS += mlkem1024_nist_keygen_tests
586mlkem1024_nist_keygen_tests_SOURCES = mlkem1024_nist_keygen_tests.c mlkem_tests_util.c
587EXTRA_DIST += mlkem1024_nist_keygen_tests.sh
588EXTRA_DIST += mlkem1024_nist_keygen_tests.txt 565EXTRA_DIST += mlkem1024_nist_keygen_tests.txt
589 566
590# mlkem768_decap_tests 567# mlkem_iteration_tests
591TESTS += mlkem768_decap_tests.sh 568TESTS += mlkem_iteration_tests
592check_PROGRAMS += mlkem768_decap_tests 569check_PROGRAMS += mlkem_iteration_tests
593mlkem768_decap_tests_SOURCES = mlkem768_decap_tests.c mlkem_tests_util.c 570mlkem_iteration_tests_SOURCES = mlkem_iteration_tests.c mlkem_tests_util.c
594EXTRA_DIST += mlkem768_decap_tests.sh
595EXTRA_DIST += mlkem768_decap_tests.txt
596
597# mlkem768_encap_tests
598TESTS += mlkem768_encap_tests.sh
599check_PROGRAMS += mlkem768_encap_tests
600mlkem768_encap_tests_SOURCES = mlkem768_encap_tests.c mlkem_tests_util.c
601EXTRA_DIST += mlkem768_encap_tests.sh
602EXTRA_DIST += mlkem768_encap_tests.txt
603
604# mlkem768_iteration_test
605TESTS += mlkem768_iteration_test
606check_PROGRAMS += mlkem768_iteration_test
607mlkem768_iteration_test_SOURCES = mlkem768_iteration_test.c mlkem_tests_util.c
608
609# mlkem768_keygen_tests
610TESTS += mlkem768_keygen_tests.sh
611check_PROGRAMS += mlkem768_keygen_tests
612mlkem768_keygen_tests_SOURCES = mlkem768_keygen_tests.c mlkem_tests_util.c
613EXTRA_DIST += mlkem768_keygen_tests.sh
614EXTRA_DIST += mlkem768_keygen_tests.txt
615
616# mlkem768_nist_decap_tests
617TESTS += mlkem768_nist_decap_tests.sh
618check_PROGRAMS += mlkem768_nist_decap_tests
619mlkem768_nist_decap_tests_SOURCES = mlkem768_nist_decap_tests.c mlkem_tests_util.c
620EXTRA_DIST += mlkem768_nist_decap_tests.sh
621EXTRA_DIST += mlkem768_nist_decap_tests.txt
622
623# mlkem768_nist_keygen_tests
624TESTS += mlkem768_nist_keygen_tests.sh
625check_PROGRAMS += mlkem768_nist_keygen_tests
626mlkem768_nist_keygen_tests_SOURCES = mlkem768_nist_keygen_tests.c mlkem_tests_util.c
627EXTRA_DIST += mlkem768_nist_keygen_tests.sh
628EXTRA_DIST += mlkem768_nist_keygen_tests.txt
629 571
630# mlkem_unittest 572# mlkem_unittest
631TESTS += mlkem_unittest 573TESTS += mlkem_unittest
diff --git a/tests/mlkem1024_decap_tests.sh b/tests/mlkem1024_decap_tests.sh
deleted file mode 100755
index 95efa48..0000000
--- a/tests/mlkem1024_decap_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem1024_decap_tests
4if [ -e ./mlkem1024_decap_tests.exe ]; then
5 TEST=./mlkem1024_decap_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem1024_decap_tests.txt
diff --git a/tests/mlkem1024_encap_tests.sh b/tests/mlkem1024_encap_tests.sh
deleted file mode 100755
index 9f4f2b1..0000000
--- a/tests/mlkem1024_encap_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem1024_encap_tests
4if [ -e ./mlkem1024_encap_tests.exe ]; then
5 TEST=./mlkem1024_encap_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem1024_encap_tests.txt
diff --git a/tests/mlkem1024_keygen_tests.sh b/tests/mlkem1024_keygen_tests.sh
deleted file mode 100755
index 5287cf2..0000000
--- a/tests/mlkem1024_keygen_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem1024_keygen_tests
4if [ -e ./mlkem1024_keygen_tests.exe ]; then
5 TEST=./mlkem1024_keygen_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem1024_keygen_tests.txt
diff --git a/tests/mlkem1024_nist_decap_tests.sh b/tests/mlkem1024_nist_decap_tests.sh
deleted file mode 100755
index 58bfc4e..0000000
--- a/tests/mlkem1024_nist_decap_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem1024_nist_decap_tests
4if [ -e ./mlkem1024_nist_decap_tests.exe ]; then
5 TEST=./mlkem1024_nist_decap_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem1024_nist_decap_tests.txt
diff --git a/tests/mlkem1024_nist_keygen_tests.sh b/tests/mlkem1024_nist_keygen_tests.sh
deleted file mode 100755
index 643109c..0000000
--- a/tests/mlkem1024_nist_keygen_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem1024_nist_keygen_tests
4if [ -e ./mlkem1024_nist_keygen_tests.exe ]; then
5 TEST=./mlkem1024_nist_keygen_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem1024_nist_keygen_tests.txt
diff --git a/tests/mlkem768_decap_tests.sh b/tests/mlkem768_decap_tests.sh
deleted file mode 100755
index af11da3..0000000
--- a/tests/mlkem768_decap_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem768_decap_tests
4if [ -e ./mlkem768_decap_tests.exe ]; then
5 TEST=./mlkem768_decap_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem768_decap_tests.txt
diff --git a/tests/mlkem768_encap_tests.sh b/tests/mlkem768_encap_tests.sh
deleted file mode 100755
index ee5c979..0000000
--- a/tests/mlkem768_encap_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem768_encap_tests
4if [ -e ./mlkem768_encap_tests.exe ]; then
5 TEST=./mlkem768_encap_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem768_encap_tests.txt
diff --git a/tests/mlkem768_keygen_tests.sh b/tests/mlkem768_keygen_tests.sh
deleted file mode 100755
index 0c84709..0000000
--- a/tests/mlkem768_keygen_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem768_keygen_tests
4if [ -e ./mlkem768_keygen_tests.exe ]; then
5 TEST=./mlkem768_keygen_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem768_keygen_tests.txt
diff --git a/tests/mlkem768_nist_decap_tests.sh b/tests/mlkem768_nist_decap_tests.sh
deleted file mode 100755
index 42bdedc..0000000
--- a/tests/mlkem768_nist_decap_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem768_nist_decap_tests
4if [ -e ./mlkem768_nist_decap_tests.exe ]; then
5 TEST=./mlkem768_nist_decap_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem768_nist_decap_tests.txt
diff --git a/tests/mlkem768_nist_keygen_tests.sh b/tests/mlkem768_nist_keygen_tests.sh
deleted file mode 100755
index 0c84709..0000000
--- a/tests/mlkem768_nist_keygen_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
1#!/bin/sh
2set -e
3TEST=./mlkem768_keygen_tests
4if [ -e ./mlkem768_keygen_tests.exe ]; then
5 TEST=./mlkem768_keygen_tests.exe
6fi
7
8if [ -z $srcdir ]; then
9 srcdir=.
10fi
11
12$TEST $srcdir/mlkem768_keygen_tests.txt
diff --git a/tests/mlkem_tests.sh b/tests/mlkem_tests.sh
new file mode 100755
index 0000000..aaad199
--- /dev/null
+++ b/tests/mlkem_tests.sh
@@ -0,0 +1,22 @@
1#!/bin/sh
2set -e
3
4TEST=./mlkem_tests
5if [ -e ./mlkem_tests.exe ]; then
6 TEST=./mlkem_tests.exe
7fi
8
9if [ -z $srcdir ]; then
10 srcdir=.
11fi
12
13$TEST mlkem768_decap_tests $srcdir/mlkem768_decap_tests.txt
14$TEST mlkem768_encap_tests $srcdir/mlkem768_encap_tests.txt
15$TEST mlkem768_keygen_tests $srcdir/mlkem768_keygen_tests.txt
16$TEST mlkem768_nist_decap_tests $srcdir/mlkem768_nist_decap_tests.txt
17$TEST mlkem768_nist_keygen_tests $srcdir/mlkem768_nist_keygen_tests.txt
18$TEST mlkem1024_decap_tests $srcdir/mlkem1024_decap_tests.txt
19$TEST mlkem1024_encap_tests $srcdir/mlkem1024_encap_tests.txt
20$TEST mlkem1024_keygen_tests $srcdir/mlkem1024_keygen_tests.txt
21$TEST mlkem1024_nist_decap_tests $srcdir/mlkem1024_nist_decap_tests.txt
22$TEST mlkem1024_nist_keygen_tests $srcdir/mlkem1024_nist_keygen_tests.txt