Update HACL to 86a0aed822bd80b03e4810e23518181f0edec5f6 (#412)

* cache C build for faster build * bump criterion dependency * Rust v0.0.2 * update to HACL 86a0aed822bd80b03e4810e23518181f0edec5f6
cryspen · Jun 13, 2023 · e4b4f23 · e4b4f23
1 parent 5ab0df7
commit e4b4f23
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 171 deletions.
diff --git a/config/default_config.cmake b/config/default_config.cmake
@@ -120,18 +120,23 @@ set(INCLUDES
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Krmllib.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Krmllib.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_HMAC_DRBG.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_Spec.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Types.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_HMAC.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_SHA2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Blake2.h
 	${PROJECT_SOURCE_DIR}/include/Lib_Memzero0.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Ed25519.h
-	${PROJECT_SOURCE_DIR}/include/internal/Hacl_SHA2_Generic.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Types.h
+	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Hash_SHA2.h
+	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA2.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Ed25519_PrecompTable.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Curve25519_51.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Bignum25519_51.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Curve25519_51.h
+	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Bignum_Base.h
+	${PROJECT_SOURCE_DIR}/include/lib_intrinsics.h
+	${PROJECT_SOURCE_DIR}/build/config.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics_128.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Ed25519.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_EC_Ed25519.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Base.h
@@ -141,16 +146,11 @@ set(INCLUDES
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Blake2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Blake2b_256.h
 	${PROJECT_SOURCE_DIR}/include/libintvector.h
-	${PROJECT_SOURCE_DIR}/build/config.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Blake2b_256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Blake2s_128.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Blake2s_128.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum256_32.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum.h
-	${PROJECT_SOURCE_DIR}/include/lib_intrinsics.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics_128.h
-	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Bignum_Base.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Bignum.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Bignum.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum256.h
@@ -182,20 +182,18 @@ set(INCLUDES
 	${PROJECT_SOURCE_DIR}/include/internal/Vale.h
 	${PROJECT_SOURCE_DIR}/include/curve25519-inline.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_P256.h
-	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Spec.h
-	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Spec.h
+	${PROJECT_SOURCE_DIR}/include/internal/Hacl_P256_PrecompTable.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_P256.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_K256_ECDSA.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_K256_PrecompTable.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Bignum_K256.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_K256_ECDSA.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_EC_K256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_FFDHE.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_Spec.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Impl_FFDHE_Constants.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Hash_SHA3.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA3.h
-	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Hash_SHA2.h
-	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_SHA2_Vec128.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_SHA2_Types.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_SHA2_Vec256.h
@@ -227,6 +225,8 @@ set(INCLUDES
 	${PROJECT_SOURCE_DIR}/include/Hacl_HPKE_P256_CP32_SHA256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Frodo1344.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_SHA3.h
+	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Spec.h
+	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Spec.h
 	${PROJECT_SOURCE_DIR}/include/internal/Hacl_Frodo_KEM.h
 	${PROJECT_SOURCE_DIR}/include/Lib_RandomBuffer_System.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Frodo640.h
@@ -261,29 +261,29 @@ set(PUBLIC_INCLUDES
 	${PROJECT_SOURCE_DIR}/include/Hacl_Curve25519_51.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Krmllib.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_HMAC_DRBG.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_Spec.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Types.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_HMAC.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_SHA2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Blake2.h
 	${PROJECT_SOURCE_DIR}/include/Lib_Memzero0.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Types.h
+	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA2.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Curve25519_51.h
+	${PROJECT_SOURCE_DIR}/include/lib_intrinsics.h
+	${PROJECT_SOURCE_DIR}/build/config.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics_128.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Ed25519.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_EC_Ed25519.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Base.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_Blake2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Blake2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Blake2b_256.h
 	${PROJECT_SOURCE_DIR}/include/libintvector.h
-	${PROJECT_SOURCE_DIR}/build/config.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Blake2b_256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_Blake2s_128.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Blake2s_128.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum256_32.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum.h
-	${PROJECT_SOURCE_DIR}/include/lib_intrinsics.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics.h
-	${PROJECT_SOURCE_DIR}/include/Hacl_IntTypes_Intrinsics_128.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Bignum.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Bignum32.h
@@ -309,13 +309,12 @@ set(PUBLIC_INCLUDES
 	${PROJECT_SOURCE_DIR}/include/Hacl_Streaming_Poly1305_256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Curve25519_64.h
 	${PROJECT_SOURCE_DIR}/include/curve25519-inline.h
-	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Spec.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_P256.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_K256_ECDSA.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_EC_K256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_FFDHE.h
+	${PROJECT_SOURCE_DIR}/include/Hacl_Spec.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA3.h
-	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA2.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_SHA2_Vec128.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_SHA2_Vec256.h
 	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Hash_SHA1.h
@@ -344,6 +343,7 @@ set(PUBLIC_INCLUDES
 	${PROJECT_SOURCE_DIR}/include/Hacl_HPKE_P256_CP32_SHA256.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Frodo1344.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Hash_SHA3.h
+	${PROJECT_SOURCE_DIR}/include/internal/../Hacl_Spec.h
 	${PROJECT_SOURCE_DIR}/include/Lib_RandomBuffer_System.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Frodo640.h
 	${PROJECT_SOURCE_DIR}/include/Hacl_Frodo976.h

diff --git a/info.txt b/info.txt
@@ -1,5 +1,5 @@
 The code was generated with the following toolchain.
-F* version: 355ef023467941eaf0a3ca876cd391c9f69ed78
-KaRaMeL version: 3e283efd721ceff6fc11eef4c4908662287a6ff9
-HACL* version: 9581fb9b0382aef4589e0cb76016b70b25b5add0
+F* version: e617752a1b014a16892f7d8772d62e5c234f06c1
+KaRaMeL version: 2cf2974007f4103dba5619e4eb9e3eaeefad533b
+HACL* version: 86a0aed822bd80b03e4810e23518181f0edec5f6
 Vale version: 0.3.19