From: Jonathan Protzenko <protz@microsoft.com>
Date: Thu, 11 May 2023 21:23:52 +0000 (-0700)
Subject: gh-99108: Refresh HACL* from upstream (#104401)
X-Git-Tag: v3.12.0b1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d7dd4cd70ed997ed7c3cda867c4e7b1ab02b205;p=thirdparty%2FPython%2Fcpython.git

gh-99108: Refresh HACL* from upstream (#104401)

Refresh HACL* from upstream and add a SHA3 test hashing over 4GiB of data.
---

diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
index 08cb5eb0c2bb..73d758a3631b 100644
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -359,6 +359,15 @@ class HashLibTestCase(unittest.TestCase):
         h.update(b"hello world")
         self.assertEqual(h.hexdigest(), "a5364f7a52ebe2e25f1838a4ca715a893b6fd7a23f2a0d9e9762120da8b1bf53")
 
+    @requires_resource('cpu')
+    def test_sha3_256_update_over_4gb(self):
+        zero_1mb = b"\0" * 1024 * 1024
+        h = hashlib.sha3_256()
+        for i in range(0, 4096):
+            h.update(zero_1mb)
+        h.update(b"hello world")
+        self.assertEqual(h.hexdigest(), "e2d4535e3b613135c14f2fe4e026d7ad8d569db44901740beffa30d430acb038")
+
     def check(self, name, data, hexdigest, shake=False, **kwargs):
         length = len(hexdigest)//2
         hexdigest = hexdigest.lower()
diff --git a/Modules/_hacl/Hacl_Hash_SHA3.c b/Modules/_hacl/Hacl_Hash_SHA3.c
index 100afe7c2c6d..58eb436881d4 100644
--- a/Modules/_hacl/Hacl_Hash_SHA3.c
+++ b/Modules/_hacl/Hacl_Hash_SHA3.c
@@ -244,7 +244,7 @@ Hacl_Streaming_Keccak_update(Hacl_Streaming_Keccak_state *p, uint8_t *data, uint
   Hacl_Streaming_Keccak_hash_buf block_state = s.block_state;
   uint64_t total_len = s.total_len;
   Spec_Hash_Definitions_hash_alg i = block_state.fst;
-  if ((uint64_t)len > (uint64_t)0xffffffffU - total_len)
+  if ((uint64_t)len > (uint64_t)0xffffffffffffffffU - total_len)
   {
     return (uint32_t)1U;
   }
diff --git a/Modules/_hacl/refresh.sh b/Modules/_hacl/refresh.sh
index 220ebbe55613..d2ba05f30d86 100755
--- 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=363eae2c2eb60e46f182ddd4bd1cd3f1d00b35c9
+expected_hacl_star_rev=b6903a3e6458000730c3d83174d4b08d6d3e2ece
 
 hacl_dir="$(realpath "$1")"
 cd "$(dirname "$0")"