aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2024-12-17 10:18:16 +0100
committerTheo Buehler <tb@openbsd.org>2024-12-17 10:35:54 +0100
commitf46d437e5149fced7b0c71a4c40a1b2fbb78dc90 (patch)
tree5e30d8d602c813281abdfb0f2a5833344b1fc3a1
parent7af85365c55f491c03134c5c2e269bbedf3f08b2 (diff)
downloadportable-f46d437e5149fced7b0c71a4c40a1b2fbb78dc90.tar.gz
portable-f46d437e5149fced7b0c71a4c40a1b2fbb78dc90.tar.bz2
portable-f46d437e5149fced7b0c71a4c40a1b2fbb78dc90.zip
Some fixes for ML-KEM tests
- Run the 1024 iteration test as well as unit tests. - Remove unused test script with unexpected contents. Follow-on to #1127
-rw-r--r--tests/CMakeLists.txt12
-rw-r--r--tests/Makefile.am10
-rwxr-xr-xtests/mlkem1024_iteration_test.sh12
3 files changed, 22 insertions, 12 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba521ad..8b079f4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -548,6 +548,12 @@ target_link_libraries(mlkem1024_encap_tests ${OPENSSL_TEST_LIBS})
548prepare_emscripten_test_target(mlkem1024_encap_tests) 548prepare_emscripten_test_target(mlkem1024_encap_tests)
549add_platform_test(mlkem1024_encap_tests mlkem1024_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_encap_tests.txt) 549add_platform_test(mlkem1024_encap_tests mlkem1024_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_encap_tests.txt)
550 550
551# mlkem1024_iteration_test
552add_executable(mlkem1024_iteration_test mlkem1024_iteration_test.c mlkem_tests_util.c)
553target_link_libraries(mlkem1024_iteration_test ${OPENSSL_TEST_LIBS})
554prepare_emscripten_test_target(mlkem1024_iteration_test)
555add_platform_test(mlkem1024_iteration_test mlkem1024_iteration_test)
556
551# mlkem1024_keygen_tests 557# mlkem1024_keygen_tests
552add_executable(mlkem1024_keygen_tests mlkem1024_keygen_tests.c mlkem_tests_util.c) 558add_executable(mlkem1024_keygen_tests mlkem1024_keygen_tests.c mlkem_tests_util.c)
553target_link_libraries(mlkem1024_keygen_tests ${OPENSSL_TEST_LIBS}) 559target_link_libraries(mlkem1024_keygen_tests ${OPENSSL_TEST_LIBS})
@@ -602,6 +608,12 @@ target_link_libraries(mlkem768_nist_keygen_tests ${OPENSSL_TEST_LIBS})
602prepare_emscripten_test_target(mlkem768_nist_keygen_tests) 608prepare_emscripten_test_target(mlkem768_nist_keygen_tests)
603add_platform_test(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_keygen_tests.txt) 609add_platform_test(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_keygen_tests.txt)
604 610
611# mlkem_unittest
612add_executable(mlkem_unittest mlkem_unittest.c mlkem_tests_util.c)
613target_link_libraries(mlkem_unittest ${OPENSSL_TEST_LIBS})
614prepare_emscripten_test_target(mlkem_unittest)
615add_platform_test(mlkem_unittest mlkem_unittest)
616
605# objectstest 617# objectstest
606add_executable(objectstest objectstest.c) 618add_executable(objectstest objectstest.c)
607target_link_libraries(objectstest ${OPENSSL_TEST_LIBS}) 619target_link_libraries(objectstest ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 36cbb9a..6cb2d3f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -560,6 +560,11 @@ mlkem1024_encap_tests_SOURCES = mlkem1024_encap_tests.c mlkem_tests_util.c
560EXTRA_DIST += mlkem1024_encap_tests.sh 560EXTRA_DIST += mlkem1024_encap_tests.sh
561EXTRA_DIST += mlkem1024_encap_tests.txt 561EXTRA_DIST += mlkem1024_encap_tests.txt
562 562
563# mlkem1024_iteration_test
564TESTS += mlkem1024_iteration_test
565check_PROGRAMS += mlkem1024_iteration_test
566mlkem1024_iteration_test_SOURCES = mlkem1024_iteration_test.c mlkem_tests_util.c
567
563# mlkem1024_keygen_tests 568# mlkem1024_keygen_tests
564TESTS += mlkem1024_keygen_tests.sh 569TESTS += mlkem1024_keygen_tests.sh
565check_PROGRAMS += mlkem1024_keygen_tests 570check_PROGRAMS += mlkem1024_keygen_tests
@@ -621,6 +626,11 @@ mlkem768_nist_keygen_tests_SOURCES = mlkem768_nist_keygen_tests.c mlkem_tests_ut
621EXTRA_DIST += mlkem768_nist_keygen_tests.sh 626EXTRA_DIST += mlkem768_nist_keygen_tests.sh
622EXTRA_DIST += mlkem768_nist_keygen_tests.txt 627EXTRA_DIST += mlkem768_nist_keygen_tests.txt
623 628
629# mlkem_unittest
630TESTS += mlkem_unittest
631check_PROGRAMS += mlkem_unittest
632mlkem_unittest_SOURCES = mlkem_unittest.c mlkem_tests_util.c
633
624# objectstest 634# objectstest
625TESTS += objectstest 635TESTS += objectstest
626check_PROGRAMS += objectstest 636check_PROGRAMS += objectstest
diff --git a/tests/mlkem1024_iteration_test.sh b/tests/mlkem1024_iteration_test.sh
deleted file mode 100755
index 95efa48..0000000
--- a/tests/mlkem1024_iteration_test.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