diff options
author | Theo Buehler <tb@openbsd.org> | 2024-12-17 10:18:16 +0100 |
---|---|---|
committer | Theo Buehler <tb@openbsd.org> | 2024-12-17 10:35:54 +0100 |
commit | f46d437e5149fced7b0c71a4c40a1b2fbb78dc90 (patch) | |
tree | 5e30d8d602c813281abdfb0f2a5833344b1fc3a1 /tests | |
parent | 7af85365c55f491c03134c5c2e269bbedf3f08b2 (diff) | |
download | portable-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
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CMakeLists.txt | 12 | ||||
-rw-r--r-- | tests/Makefile.am | 10 | ||||
-rwxr-xr-x | tests/mlkem1024_iteration_test.sh | 12 |
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}) | |||
548 | prepare_emscripten_test_target(mlkem1024_encap_tests) | 548 | prepare_emscripten_test_target(mlkem1024_encap_tests) |
549 | add_platform_test(mlkem1024_encap_tests mlkem1024_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_encap_tests.txt) | 549 | add_platform_test(mlkem1024_encap_tests mlkem1024_encap_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem1024_encap_tests.txt) |
550 | 550 | ||
551 | # mlkem1024_iteration_test | ||
552 | add_executable(mlkem1024_iteration_test mlkem1024_iteration_test.c mlkem_tests_util.c) | ||
553 | target_link_libraries(mlkem1024_iteration_test ${OPENSSL_TEST_LIBS}) | ||
554 | prepare_emscripten_test_target(mlkem1024_iteration_test) | ||
555 | add_platform_test(mlkem1024_iteration_test mlkem1024_iteration_test) | ||
556 | |||
551 | # mlkem1024_keygen_tests | 557 | # mlkem1024_keygen_tests |
552 | add_executable(mlkem1024_keygen_tests mlkem1024_keygen_tests.c mlkem_tests_util.c) | 558 | add_executable(mlkem1024_keygen_tests mlkem1024_keygen_tests.c mlkem_tests_util.c) |
553 | target_link_libraries(mlkem1024_keygen_tests ${OPENSSL_TEST_LIBS}) | 559 | target_link_libraries(mlkem1024_keygen_tests ${OPENSSL_TEST_LIBS}) |
@@ -602,6 +608,12 @@ target_link_libraries(mlkem768_nist_keygen_tests ${OPENSSL_TEST_LIBS}) | |||
602 | prepare_emscripten_test_target(mlkem768_nist_keygen_tests) | 608 | prepare_emscripten_test_target(mlkem768_nist_keygen_tests) |
603 | add_platform_test(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_keygen_tests.txt) | 609 | add_platform_test(mlkem768_nist_keygen_tests mlkem768_nist_keygen_tests ${CMAKE_CURRENT_SOURCE_DIR}/mlkem768_nist_keygen_tests.txt) |
604 | 610 | ||
611 | # mlkem_unittest | ||
612 | add_executable(mlkem_unittest mlkem_unittest.c mlkem_tests_util.c) | ||
613 | target_link_libraries(mlkem_unittest ${OPENSSL_TEST_LIBS}) | ||
614 | prepare_emscripten_test_target(mlkem_unittest) | ||
615 | add_platform_test(mlkem_unittest mlkem_unittest) | ||
616 | |||
605 | # objectstest | 617 | # objectstest |
606 | add_executable(objectstest objectstest.c) | 618 | add_executable(objectstest objectstest.c) |
607 | target_link_libraries(objectstest ${OPENSSL_TEST_LIBS}) | 619 | target_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 | |||
560 | EXTRA_DIST += mlkem1024_encap_tests.sh | 560 | EXTRA_DIST += mlkem1024_encap_tests.sh |
561 | EXTRA_DIST += mlkem1024_encap_tests.txt | 561 | EXTRA_DIST += mlkem1024_encap_tests.txt |
562 | 562 | ||
563 | # mlkem1024_iteration_test | ||
564 | TESTS += mlkem1024_iteration_test | ||
565 | check_PROGRAMS += mlkem1024_iteration_test | ||
566 | mlkem1024_iteration_test_SOURCES = mlkem1024_iteration_test.c mlkem_tests_util.c | ||
567 | |||
563 | # mlkem1024_keygen_tests | 568 | # mlkem1024_keygen_tests |
564 | TESTS += mlkem1024_keygen_tests.sh | 569 | TESTS += mlkem1024_keygen_tests.sh |
565 | check_PROGRAMS += mlkem1024_keygen_tests | 570 | check_PROGRAMS += mlkem1024_keygen_tests |
@@ -621,6 +626,11 @@ mlkem768_nist_keygen_tests_SOURCES = mlkem768_nist_keygen_tests.c mlkem_tests_ut | |||
621 | EXTRA_DIST += mlkem768_nist_keygen_tests.sh | 626 | EXTRA_DIST += mlkem768_nist_keygen_tests.sh |
622 | EXTRA_DIST += mlkem768_nist_keygen_tests.txt | 627 | EXTRA_DIST += mlkem768_nist_keygen_tests.txt |
623 | 628 | ||
629 | # mlkem_unittest | ||
630 | TESTS += mlkem_unittest | ||
631 | check_PROGRAMS += mlkem_unittest | ||
632 | mlkem_unittest_SOURCES = mlkem_unittest.c mlkem_tests_util.c | ||
633 | |||
624 | # objectstest | 634 | # objectstest |
625 | TESTS += objectstest | 635 | TESTS += objectstest |
626 | check_PROGRAMS += objectstest | 636 | check_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 | ||
2 | set -e | ||
3 | TEST=./mlkem1024_decap_tests | ||
4 | if [ -e ./mlkem1024_decap_tests.exe ]; then | ||
5 | TEST=./mlkem1024_decap_tests.exe | ||
6 | fi | ||
7 | |||
8 | if [ -z $srcdir ]; then | ||
9 | srcdir=. | ||
10 | fi | ||
11 | |||
12 | $TEST $srcdir/mlkem1024_decap_tests.txt | ||