Update for MLKEM changes

5 files changed, 10 insertions, 6 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 047c228..a8d74cb 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -416,8 +416,10 @@ set(
         lhash/lhash.c
         md4/md4.c
         md5/md5.c
-        mlkem/mlkem768.c
+        mlkem/mlkem.c
         mlkem/mlkem1024.c
+        mlkem/mlkem768.c
+        mlkem/mlkem_key.c
         modes/cbc128.c
         modes/ccm128.c
         modes/cfb128.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index ad241ab..610341a 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -738,9 +738,10 @@ libcrypto_la_SOURCES += md4/md4.c
 libcrypto_la_SOURCES += md5/md5.c
 
 # mlkem
-libcrypto_la_SOURCES += mlkem/mlkem768.c
+libcrypto_la_SOURCES += mlkem/mlkem.c
 libcrypto_la_SOURCES += mlkem/mlkem1024.c
-noinst_HEADERS += mlkem/mlkem.h
+libcrypto_la_SOURCES += mlkem/mlkem768.c
+libcrypto_la_SOURCES += mlkem/mlkem_key.c
 noinst_HEADERS += mlkem/mlkem_internal.h
 
 # modes
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c497b77..32fe36a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -563,7 +563,7 @@ if(NOT WIN32)
 endif()
 
 # mlkem_tests
-add_executable(mlkem_tests mlkem_tests.c mlkem_tests_util.c parse_test_file.c)
+add_executable(mlkem_tests mlkem_tests.c parse_test_file.c)
 target_link_libraries(mlkem_tests ${OPENSSL_TEST_LIBS})
 prepare_emscripten_test_target(mlkem_tests)
 if(NOT WIN32)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 914b1e5..2052f0c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -577,7 +577,7 @@ noinst_HEADERS += parse_test_file.h
 # mlkem_tests
 TESTS += mlkem_tests.sh
 check_PROGRAMS += mlkem_tests
-mlkem_tests_SOURCES = mlkem_tests.c mlkem_tests_util.c parse_test_file.c
+mlkem_tests_SOURCES = mlkem_tests.c parse_test_file.c
 EXTRA_DIST += mlkem_tests.sh
 EXTRA_DIST += mlkem768_decap_tests.txt
 EXTRA_DIST += mlkem768_encap_tests.txt
@@ -589,6 +589,7 @@ EXTRA_DIST += mlkem1024_encap_tests.txt
 EXTRA_DIST += mlkem1024_keygen_tests.txt
 EXTRA_DIST += mlkem1024_nist_decap_tests.txt
 EXTRA_DIST += mlkem1024_nist_keygen_tests.txt
+# XXX - add tests for Windows
 
 # mlkem_iteration_tests
 TESTS += mlkem_iteration_tests
diff --git a/update.sh b/update.sh
index e8b0566..761953a 100755
--- a/update.sh
+++ b/update.sh
@@ -142,7 +142,7 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
         ossl_typ.h err/err.h crypto.h comp/comp.h x509/x509.h buffer/buffer.h
         objects/objects.h asn1/asn1.h asn1/posix_time.h bn/bn.h ec/ec.h ecdsa/ecdsa.h
         ecdh/ecdh.h rsa/rsa.h sha/sha.h x509/x509_vfy.h pkcs7/pkcs7.h pem/pem.h
-        hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
+        hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h mlkem/mlkem.h
         x509/x509v3.h conf/conf.h ocsp/ocsp.h
         aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h
         bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h des/des.h dh/dh.h