gh-126433: Update hacl-star (GH-126791)

Retrieve the change: "Lib_Memzero0.c: Fix compiler warning on 32-bit Windows".
2024-11-21 12:59:38 +01:00 · 2024-11-15 01:22:50 +01:00 · 2024-11-15 01:22:50 +01:00 · 3fecbe9255
commit 3fecbe9255
parent 9a456383be
10 changed files with 37 additions and 30 deletions
--- a/Misc/sbom.spdx.json
+++ b/Misc/sbom.spdx.json
@ -300,11 +300,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "a34e821b68ef5334eccf4f729b28bb7bb65b965e"
+          "checksumValue": "1cd3cda98e0e6882a13a59268b88640c542350fd"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "4582db9143c0810b98838a5357c577e0b32ae77f3018486159df4e0dfd3fce3c"
+          "checksumValue": "41a420bc9355e451720e60e9536e66f04dc6e416ca9217c4ab18d827887a2e08"
        }
      ],
      "fileName": "Modules/_hacl/Hacl_Hash_Blake2b.c"
@ -328,11 +328,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "0ffe60c6d5eed5dd222515e820d461d319d16b1f"
+          "checksumValue": "0ceef306590ec12251db03a31fc08ecba697486d"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "4804cb3ce68bfdcf98853d6f1d77b4a844a3c2796f776b39770ba327e400d402"
+          "checksumValue": "1575a23b21319e55e670f74194fc2dfd1777eb5a3816cad43750e03da6e44db9"
        }
      ],
      "fileName": "Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c"
@ -370,11 +370,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "cf035ffeff875bc74345a47373ce25dc408ea9dc"
+          "checksumValue": "9616a9f8d795d64487bf86a96719f943729621e2"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "579059b002c45fab0fed6381e85c3f5eaf1d959400ca64b103542ac6c35bade3"
+          "checksumValue": "5ecde5ddc8ec073cffe64d60e868535d995f33fb0f87f9b50e68bd2a694b7434"
        }
      ],
      "fileName": "Modules/_hacl/Hacl_Hash_Blake2s.c"
@ -398,11 +398,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "9bb53022d158a9c349edb52a8def8aac7d098a4e"
+          "checksumValue": "5b950ce0a5c8f0c2c56b4ac96e1943b504255d45"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "2abde0c6b5da0402e91b4bedfe786c24b908fbdc04e08e74651c7624729254d9"
+          "checksumValue": "5a5f5d8e376dc30d89fd6c6c435157fe9ffa5308030e7abb1256afaee0765536"
        }
      ],
      "fileName": "Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c"
@ -496,11 +496,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "f2aa3ed6acce621c162bc3a0592780ce5aa3bc4d"
+          "checksumValue": "b0aa8810339adb09623ffa429246b4324fac4565"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "30638efb75c8b185bb09c3df6977e3f3c5d21a1e696218cf7ade6bc4d5201b31"
+          "checksumValue": "2288f8f860efe80eed4f1e14ef570079b7459aeb41f87e94e691d7cf5e0e7adb"
        }
      ],
      "fileName": "Modules/_hacl/Hacl_Hash_SHA2.c"
@ -524,11 +524,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "fc2c3ef83a71bef42eb3f73b78e4ef6642a4634e"
+          "checksumValue": "ef374b9d0951ebb38006af944dd4b38a6cf3abb2"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "e4f3ed9d1e8f661482cbd2d04b197e15cc3b698c5ef2ddedf0eb65df320dbbc4"
+          "checksumValue": "164df19f229143006c5f9a3c0bd771415f152bfbc7efb61c337fa0f903003eb3"
        }
      ],
      "fileName": "Modules/_hacl/Hacl_Hash_SHA3.c"
@ -566,11 +566,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "47ce34375d43a27312e1fffb96b8965610b05855"
+          "checksumValue": "2e08072c0c57dac02b67f3f71d77068c537ac02e"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "8affd767d7644150064d8bccd05d7bf4c4ae41fd4bb5bf5b8e943eabf09f3d74"
+          "checksumValue": "e69fd3e84f77873ecb414f5300761b686321d01f5710ccf2517765236b08fc25"
        }
      ],
      "fileName": "Modules/_hacl/Lib_Memzero0.c"
@ -748,11 +748,11 @@
      "checksums": [
        {
          "algorithm": "SHA1",
-          "checksumValue": "0018e084339058dd454b4e49d10d236b4f896bf8"
+          "checksumValue": "2e9ae174142fc491f20567ab8b5c08cef9b07cfe"
        },
        {
          "algorithm": "SHA256",
-          "checksumValue": "10e959a92b3288a6165a404c8fae2bbcd7fb00a9abbae2b7809fa55d6fe9068d"
+          "checksumValue": "07100964adcf4b5f8bd4773e25f475b34cd180b90df8b1c0052e55c008b7cc49"
        }
      ],
      "fileName": "Modules/_hacl/internal/Hacl_Hash_SHA2.h"
@ -1640,14 +1640,14 @@
      "checksums": [
        {
          "algorithm": "SHA256",
-          "checksumValue": "935ae51d0ff0bf1403f0ecc1ff02b8f685d09053618558c07fbe4bd2abbc5dd1"
+          "checksumValue": "40de5297b032d2676fc0039049b4e8dab1f2730eebb5ecff6a40c04fa0356339"
        }
      ],
-      "downloadLocation": "https://github.com/hacl-star/hacl-star/archive/315a9e491d2bc347b9dae99e0ea506995ea84d9d.zip",
+      "downloadLocation": "https://github.com/hacl-star/hacl-star/archive/f218923ef2417d963d7efc7951593ae6aef613f7.zip",
      "externalRefs": [
        {
          "referenceCategory": "SECURITY",
-          "referenceLocator": "cpe:2.3:a:hacl-star:hacl-star:315a9e491d2bc347b9dae99e0ea506995ea84d9d:*:*:*:*:*:*:*",
+          "referenceLocator": "cpe:2.3:a:hacl-star:hacl-star:f218923ef2417d963d7efc7951593ae6aef613f7:*:*:*:*:*:*:*",
          "referenceType": "cpe23Type"
        }
      ],
@ -1655,7 +1655,7 @@
      "name": "hacl-star",
      "originator": "Organization: HACL* Developers",
      "primaryPackagePurpose": "SOURCE",
-      "versionInfo": "315a9e491d2bc347b9dae99e0ea506995ea84d9d"
+      "versionInfo": "f218923ef2417d963d7efc7951593ae6aef613f7"
    },
    {
      "SPDXID": "SPDXRef-PACKAGE-macholib",
--- a/Modules/_hacl/Hacl_Hash_Blake2b.c
+++ b/Modules/_hacl/Hacl_Hash_Blake2b.c
@ -1029,7 +1029,8 @@ Hacl_Hash_Blake2b_reset_with_key_and_params(
  uint8_t *k
 )
 {
-  index_of_state(s);
+  Hacl_Hash_Blake2b_index i1 = index_of_state(s);
+  KRML_MAYBE_UNUSED_VAR(i1);
  reset_raw(s, ((Hacl_Hash_Blake2b_params_and_key){ .fst = p, .snd = k }));
 }

--- a/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
+++ b/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
@ -855,7 +855,8 @@ Hacl_Hash_Blake2b_Simd256_reset_with_key_and_params(
  uint8_t *k
 )
 {
-  index_of_state(s);
+  Hacl_Hash_Blake2b_index i1 = index_of_state(s);
+  KRML_MAYBE_UNUSED_VAR(i1);
  reset_raw(s, ((Hacl_Hash_Blake2b_params_and_key){ .fst = p, .snd = k }));
 }

--- a/Modules/_hacl/Hacl_Hash_Blake2s.c
+++ b/Modules/_hacl/Hacl_Hash_Blake2s.c
@ -1011,7 +1011,8 @@ Hacl_Hash_Blake2s_reset_with_key_and_params(
  uint8_t *k
 )
 {
-  index_of_state(s);
+  Hacl_Hash_Blake2b_index i1 = index_of_state(s);
+  KRML_MAYBE_UNUSED_VAR(i1);
  reset_raw(s, ((Hacl_Hash_Blake2b_params_and_key){ .fst = p, .snd = k }));
 }

--- a/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
+++ b/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
@ -842,7 +842,8 @@ Hacl_Hash_Blake2s_Simd128_reset_with_key_and_params(
  uint8_t *k
 )
 {
-  index_of_state(s);
+  Hacl_Hash_Blake2b_index i1 = index_of_state(s);
+  KRML_MAYBE_UNUSED_VAR(i1);
  reset_raw(s, ((Hacl_Hash_Blake2b_params_and_key){ .fst = p, .snd = k }));
 }

--- a/Modules/_hacl/Hacl_Hash_SHA2.c
+++ b/Modules/_hacl/Hacl_Hash_SHA2.c
@ -211,7 +211,7 @@ void Hacl_Hash_SHA2_sha224_init(uint32_t *hash)
    os[i] = x;);
 }

-static inline void sha224_update_nblocks(uint32_t len, uint8_t *b, uint32_t *st)
+void Hacl_Hash_SHA2_sha224_update_nblocks(uint32_t len, uint8_t *b, uint32_t *st)
 {
  Hacl_Hash_SHA2_sha256_update_nblocks(len, b, st);
 }
@ -825,7 +825,7 @@ void Hacl_Hash_SHA2_digest_224(Hacl_Streaming_MD_state_32 *state, uint8_t *outpu
  }
  uint8_t *buf_last = buf_1 + r - ite;
  uint8_t *buf_multi = buf_1;
-  sha224_update_nblocks(0U, buf_multi, tmp_block_state);
+  Hacl_Hash_SHA2_sha224_update_nblocks(0U, buf_multi, tmp_block_state);
  uint64_t prev_len_last = total_len - (uint64_t)r;
  Hacl_Hash_SHA2_sha224_update_last(prev_len_last + (uint64_t)r, r, buf_last, tmp_block_state);
  Hacl_Hash_SHA2_sha224_finish(tmp_block_state, output);
@ -847,7 +847,7 @@ void Hacl_Hash_SHA2_hash_224(uint8_t *output, uint8_t *input, uint32_t input_len
  Hacl_Hash_SHA2_sha224_init(st);
  uint32_t rem = input_len % 64U;
  uint64_t len_ = (uint64_t)input_len;
-  sha224_update_nblocks(input_len, ib, st);
+  Hacl_Hash_SHA2_sha224_update_nblocks(input_len, ib, st);
  uint32_t rem1 = input_len % 64U;
  uint8_t *b0 = ib;
  uint8_t *lb = b0 + input_len - rem1;
--- a/Modules/_hacl/Hacl_Hash_SHA3.c
+++ b/Modules/_hacl/Hacl_Hash_SHA3.c
@ -251,7 +251,8 @@ Hacl_Hash_SHA3_update_multi_sha3(
    uint8_t *bl0 = b_;
    uint8_t *uu____0 = b0 + i * block_len(a);
    memcpy(bl0, uu____0, block_len(a) * sizeof (uint8_t));
-    block_len(a);
+    uint32_t unused = block_len(a);
+    KRML_MAYBE_UNUSED_VAR(unused);
    absorb_inner_32(b_, s);
  }
 }
--- a/Modules/_hacl/Lib_Memzero0.c
+++ b/Modules/_hacl/Lib_Memzero0.c
@ -36,7 +36,7 @@ void Lib_Memzero0_memzero0(void *dst, uint64_t len) {
  size_t len_ = (size_t) len;

  #ifdef _WIN32
-    SecureZeroMemory(dst, len);
+    SecureZeroMemory(dst, len_);
  #elif defined(__APPLE__) && defined(__MACH__)
    memset_s(dst, len_, 0, len_);
  #elif (defined(__linux__) && !defined(LINUX_NO_EXPLICIT_BZERO)) || defined(__FreeBSD__)
--- a/Modules/_hacl/internal/Hacl_Hash_SHA2.h
+++ b/Modules/_hacl/internal/Hacl_Hash_SHA2.h
@ -123,6 +123,8 @@ void Hacl_Hash_SHA2_sha256_finish(uint32_t *st, uint8_t *h);

 void Hacl_Hash_SHA2_sha224_init(uint32_t *hash);

+void Hacl_Hash_SHA2_sha224_update_nblocks(uint32_t len, uint8_t *b, uint32_t *st);
+
 void
 Hacl_Hash_SHA2_sha224_update_last(uint64_t totlen, uint32_t len, uint8_t *b, uint32_t *st);

--- a/Modules/_hacl/refresh.sh
+++ b/Modules/_hacl/refresh.sh
@ -22,7 +22,7 @@ fi

 # Update this when updating to a new version after verifying that the changes
 # the update brings in are good.
-expected_hacl_star_rev=315a9e491d2bc347b9dae99e0ea506995ea84d9d
+expected_hacl_star_rev=f218923ef2417d963d7efc7951593ae6aef613f7

 hacl_dir="$(realpath "$1")"
 cd "$(dirname "$0")"