Merge 826413c into 5e51d8a

cryspen · May 7, 2024 · e1e23b5 · e1e23b5
2 parents 5e51d8a + 826413c
commit e1e23b5
Show file tree

Hide file tree

Showing 26 changed files with 9,493 additions and 3,771 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -477,10 +477,11 @@ if(ENABLE_TESTS)
             target_compile_options(${TEST_NAME} PRIVATE /std:c++20)
         endif(MSVC)
 
-        add_dependencies(${TEST_NAME} hacl hacl_cpu_features)
+        add_dependencies(${TEST_NAME} hacl libcrux_static hacl_cpu_features)
         target_link_libraries(${TEST_NAME} PRIVATE
             gtest_main
             hacl_static
+            libcrux_static
             hacl_cpu_features
             nlohmann_json::nlohmann_json
         )
@@ -513,7 +514,7 @@ if(ENABLE_TESTS)
                 target_compile_options(${TEST_NAME} PRIVATE /std:c++20)
             endif(MSVC)
 
-            add_dependencies(${TEST_NAME} hacl hacl_cpu_features)
+            add_dependencies(${TEST_NAME} hacl libcrux_static hacl_cpu_features)
             target_link_libraries(${TEST_NAME} PRIVATE
                 gtest_main
                 hacl_cpu_features
@@ -553,7 +554,8 @@ if(ENABLE_BENCHMARKS)
     FetchContent_Populate(benchmark
         GIT_REPOSITORY  https://github.com/google/benchmark.git
         # The latest release 1.7.1 is broken due to https://github.com/google/benchmark/pull/1517
-        GIT_TAG         b177433f3ee2513b1075140c723d73ab8901790f
+        # But also: need the fix for https://github.com/google/benchmark/pull/1669
+        GIT_TAG         bc946b919cac6f25a199a526da571638cfde109f
     )
     add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR})
 
@@ -591,9 +593,10 @@ if(ENABLE_BENCHMARKS)
             target_compile_options(${BENCH_NAME} PRIVATE /std:c++20)
         endif(NOT MSVC)
 
-        add_dependencies(${BENCH_NAME} hacl hacl_cpu_features)
+        add_dependencies(${BENCH_NAME} hacl libcrux_static hacl_cpu_features)
         target_link_libraries(${BENCH_NAME} PRIVATE
             hacl_static
+            libcrux_static
             ecckiila
             blake2
             digestif
@@ -620,7 +623,7 @@ if(ENABLE_BENCHMARKS)
 
             target_compile_definitions(${BENCH_NAME} PUBLIC NO_OPENSSL)
 
-            add_dependencies(${BENCH_NAME} hacl hacl_cpu_features)
+            add_dependencies(${BENCH_NAME} hacl libcrux_static hacl_cpu_features)
             target_link_libraries(${BENCH_NAME} PRIVATE
                 hacl_cpu_features
                 benchmark::benchmark

diff --git a/README.md b/README.md
@@ -83,6 +83,28 @@ $ ./mach build --test
 
 ... to build HACL Packages and run the tests. All actions are driven by [mach]. See `./mach --help` for details.
 
+### MSVC Build
+
+The hacl-packages build is designed for non-MSVC compilers.
+Building with MSVC can be achieved as follows.
+
+
+<details>
+  <summary><b>MSVC Build</b></summary>
+
+```powershell
+# Setup build directory
+mkdir build
+cp config\default_config_msvc.cmake build\config.cmake
+cp config\default_config_msvc.h build\config.h
+
+# Build
+cmake -B build -DBUILD_LIBCRUX=1 -G "Visual Studio 17 2022" -A x64 -DUSE_MSVC=1 -DENABLE_TESTS=ON -DENABLE_BENCHMARKS=ON
+# Use --config Release to build in release mode
+cmake --build build
+```
+</details>
+
 ## Platform support
 
 The HACL Packages are supported based on the following tiers.

diff --git a/config/config.json b/config/config.json
@@ -347,7 +347,13 @@
                 "file": "Libcrux_Kem_Kyber_Kyber768.c"
             },
             {
-                "file": "libcrux_kyber.c"
+                "file": "libcrux_kyber512.c"
+            },
+            {
+                "file": "libcrux_kyber768.c"
+            },
+            {
+                "file": "libcrux_kyber1024.c"
             },
             {
                 "file": "libcrux_hacl_glue.c"

diff --git a/config/default_config.cmake b/config/default_config.cmake
@@ -445,6 +445,7 @@ set(BENCHMARK_SOURCES
 	${PROJECT_SOURCE_DIR}/benchmarks/drbg.cc
 	${PROJECT_SOURCE_DIR}/benchmarks/hmac.cc
 	${PROJECT_SOURCE_DIR}/benchmarks/rsapss.cc
+	${PROJECT_SOURCE_DIR}/benchmarks/kyber.cc
 )
 set(VALE_SOURCES_osx
 	${PROJECT_SOURCE_DIR}/vale/src/cpuid-x86_64-darwin.S
@@ -476,6 +477,11 @@ set(VALE_SOURCES_msvc
 )
 set(LIBCRUX_SOURCES
 	${PROJECT_SOURCE_DIR}/libcrux/src/Libcrux_Kem_Kyber_Kyber768.c
+	${PROJECT_SOURCE_DIR}/libcrux/src/libcrux_kyber512.c
+	${PROJECT_SOURCE_DIR}/libcrux/src/libcrux_kyber768.c
+	${PROJECT_SOURCE_DIR}/libcrux/src/libcrux_kyber1024.c
+	${PROJECT_SOURCE_DIR}/libcrux/src/libcrux_hacl_glue.c
+	${PROJECT_SOURCE_DIR}/libcrux/src/core.c
 )
 set(ALGORITHM_TEST_FILES
 	TEST_FILES_detection