18 files changed, 2471 insertions, 690 deletions

diff --git a/Modules/Setup b/Modules/Setup
index 1d5183b..f9fa26c 100644
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -163,8 +163,8 @@ PYTHONPATH=$(COREPYTHONPATH)
 
 # hashing builtins
 #_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
-#_md5 md5module.c
-#_sha1 sha1module.c
+#_md5 md5module.c -I$(srcdir)/Modules/_hacl/include _hacl/libHacl_Hash_MD5.c
+#_sha1 sha1module.c -I$(srcdir)/Modules/_hacl/include _hacl/libHacl_Hash_SHA1.c
 #_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a
 #_sha3 _sha3/sha3module.c
 
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index 8f5e14a..d33cd82 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -77,8 +77,8 @@
 @MODULE_READLINE_TRUE@readline readline.c
 
 # hashing builtins, can be disabled with --without-builtin-hashlib-hashes
-@MODULE__MD5_TRUE@_md5 md5module.c
-@MODULE__SHA1_TRUE@_sha1 sha1module.c
+@MODULE__MD5_TRUE@_md5 md5module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_MD5.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
+@MODULE__SHA1_TRUE@_sha1 sha1module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA1.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
 @MODULE__SHA2_TRUE@_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a
 @MODULE__SHA3_TRUE@_sha3 _sha3/sha3module.c
 @MODULE__BLAKE2_TRUE@_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
diff --git a/Modules/_hacl/Hacl_Hash_MD5.c b/Modules/_hacl/Hacl_Hash_MD5.c
new file mode 100644
index 0000000..2c61306
--- /dev/null
+++ b/Modules/_hacl/Hacl_Hash_MD5.c
@@ -0,0 +1,1472 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#include "internal/Hacl_Hash_MD5.h"
+
+static uint32_t
+_h0[4U] =
+  { (uint32_t)0x67452301U, (uint32_t)0xefcdab89U, (uint32_t)0x98badcfeU, (uint32_t)0x10325476U };
+
+static uint32_t
+_t[64U] =
+  {
+    (uint32_t)0xd76aa478U, (uint32_t)0xe8c7b756U, (uint32_t)0x242070dbU, (uint32_t)0xc1bdceeeU,
+    (uint32_t)0xf57c0fafU, (uint32_t)0x4787c62aU, (uint32_t)0xa8304613U, (uint32_t)0xfd469501U,
+    (uint32_t)0x698098d8U, (uint32_t)0x8b44f7afU, (uint32_t)0xffff5bb1U, (uint32_t)0x895cd7beU,
+    (uint32_t)0x6b901122U, (uint32_t)0xfd987193U, (uint32_t)0xa679438eU, (uint32_t)0x49b40821U,
+    (uint32_t)0xf61e2562U, (uint32_t)0xc040b340U, (uint32_t)0x265e5a51U, (uint32_t)0xe9b6c7aaU,
+    (uint32_t)0xd62f105dU, (uint32_t)0x02441453U, (uint32_t)0xd8a1e681U, (uint32_t)0xe7d3fbc8U,
+    (uint32_t)0x21e1cde6U, (uint32_t)0xc33707d6U, (uint32_t)0xf4d50d87U, (uint32_t)0x455a14edU,
+    (uint32_t)0xa9e3e905U, (uint32_t)0xfcefa3f8U, (uint32_t)0x676f02d9U, (uint32_t)0x8d2a4c8aU,
+    (uint32_t)0xfffa3942U, (uint32_t)0x8771f681U, (uint32_t)0x6d9d6122U, (uint32_t)0xfde5380cU,
+    (uint32_t)0xa4beea44U, (uint32_t)0x4bdecfa9U, (uint32_t)0xf6bb4b60U, (uint32_t)0xbebfbc70U,
+    (uint32_t)0x289b7ec6U, (uint32_t)0xeaa127faU, (uint32_t)0xd4ef3085U, (uint32_t)0x4881d05U,
+    (uint32_t)0xd9d4d039U, (uint32_t)0xe6db99e5U, (uint32_t)0x1fa27cf8U, (uint32_t)0xc4ac5665U,
+    (uint32_t)0xf4292244U, (uint32_t)0x432aff97U, (uint32_t)0xab9423a7U, (uint32_t)0xfc93a039U,
+    (uint32_t)0x655b59c3U, (uint32_t)0x8f0ccc92U, (uint32_t)0xffeff47dU, (uint32_t)0x85845dd1U,
+    (uint32_t)0x6fa87e4fU, (uint32_t)0xfe2ce6e0U, (uint32_t)0xa3014314U, (uint32_t)0x4e0811a1U,
+    (uint32_t)0xf7537e82U, (uint32_t)0xbd3af235U, (uint32_t)0x2ad7d2bbU, (uint32_t)0xeb86d391U
+  };
+
+void Hacl_Hash_Core_MD5_legacy_init(uint32_t *s)
+{
+  KRML_MAYBE_FOR4(i, (uint32_t)0U, (uint32_t)4U, (uint32_t)1U, s[i] = _h0[i];);
+}
+
+static void legacy_update(uint32_t *abcd, uint8_t *x)
+{
+  uint32_t aa = abcd[0U];
+  uint32_t bb = abcd[1U];
+  uint32_t cc = abcd[2U];
+  uint32_t dd = abcd[3U];
+  uint32_t va = abcd[0U];
+  uint32_t vb0 = abcd[1U];
+  uint32_t vc0 = abcd[2U];
+  uint32_t vd0 = abcd[3U];
+  uint8_t *b0 = x;
+  uint32_t u = load32_le(b0);
+  uint32_t xk = u;
+  uint32_t ti0 = _t[0U];
+  uint32_t
+  v =
+    vb0
+    +
+      ((va + ((vb0 & vc0) | (~vb0 & vd0)) + xk + ti0)
+      << (uint32_t)7U
+      | (va + ((vb0 & vc0) | (~vb0 & vd0)) + xk + ti0) >> (uint32_t)25U);
+  abcd[0U] = v;
+  uint32_t va0 = abcd[3U];
+  uint32_t vb1 = abcd[0U];
+  uint32_t vc1 = abcd[1U];
+  uint32_t vd1 = abcd[2U];
+  uint8_t *b1 = x + (uint32_t)4U;
+  uint32_t u0 = load32_le(b1);
+  uint32_t xk0 = u0;
+  uint32_t ti1 = _t[1U];
+  uint32_t
+  v0 =
+    vb1
+    +
+      ((va0 + ((vb1 & vc1) | (~vb1 & vd1)) + xk0 + ti1)
+      << (uint32_t)12U
+      | (va0 + ((vb1 & vc1) | (~vb1 & vd1)) + xk0 + ti1) >> (uint32_t)20U);
+  abcd[3U] = v0;
+  uint32_t va1 = abcd[2U];
+  uint32_t vb2 = abcd[3U];
+  uint32_t vc2 = abcd[0U];
+  uint32_t vd2 = abcd[1U];
+  uint8_t *b2 = x + (uint32_t)8U;
+  uint32_t u1 = load32_le(b2);
+  uint32_t xk1 = u1;
+  uint32_t ti2 = _t[2U];
+  uint32_t
+  v1 =
+    vb2
+    +
+      ((va1 + ((vb2 & vc2) | (~vb2 & vd2)) + xk1 + ti2)
+      << (uint32_t)17U
+      | (va1 + ((vb2 & vc2) | (~vb2 & vd2)) + xk1 + ti2) >> (uint32_t)15U);
+  abcd[2U] = v1;
+  uint32_t va2 = abcd[1U];
+  uint32_t vb3 = abcd[2U];
+  uint32_t vc3 = abcd[3U];
+  uint32_t vd3 = abcd[0U];
+  uint8_t *b3 = x + (uint32_t)12U;
+  uint32_t u2 = load32_le(b3);
+  uint32_t xk2 = u2;
+  uint32_t ti3 = _t[3U];
+  uint32_t
+  v2 =
+    vb3
+    +
+      ((va2 + ((vb3 & vc3) | (~vb3 & vd3)) + xk2 + ti3)
+      << (uint32_t)22U
+      | (va2 + ((vb3 & vc3) | (~vb3 & vd3)) + xk2 + ti3) >> (uint32_t)10U);
+  abcd[1U] = v2;
+  uint32_t va3 = abcd[0U];
+  uint32_t vb4 = abcd[1U];
+  uint32_t vc4 = abcd[2U];
+  uint32_t vd4 = abcd[3U];
+  uint8_t *b4 = x + (uint32_t)16U;
+  uint32_t u3 = load32_le(b4);
+  uint32_t xk3 = u3;
+  uint32_t ti4 = _t[4U];
+  uint32_t
+  v3 =
+    vb4
+    +
+      ((va3 + ((vb4 & vc4) | (~vb4 & vd4)) + xk3 + ti4)
+      << (uint32_t)7U
+      | (va3 + ((vb4 & vc4) | (~vb4 & vd4)) + xk3 + ti4) >> (uint32_t)25U);
+  abcd[0U] = v3;
+  uint32_t va4 = abcd[3U];
+  uint32_t vb5 = abcd[0U];
+  uint32_t vc5 = abcd[1U];
+  uint32_t vd5 = abcd[2U];
+  uint8_t *b5 = x + (uint32_t)20U;
+  uint32_t u4 = load32_le(b5);
+  uint32_t xk4 = u4;
+  uint32_t ti5 = _t[5U];
+  uint32_t
+  v4 =
+    vb5
+    +
+      ((va4 + ((vb5 & vc5) | (~vb5 & vd5)) + xk4 + ti5)
+      << (uint32_t)12U
+      | (va4 + ((vb5 & vc5) | (~vb5 & vd5)) + xk4 + ti5) >> (uint32_t)20U);
+  abcd[3U] = v4;
+  uint32_t va5 = abcd[2U];
+  uint32_t vb6 = abcd[3U];
+  uint32_t vc6 = abcd[0U];
+  uint32_t vd6 = abcd[1U];
+  uint8_t *b6 = x + (uint32_t)24U;
+  uint32_t u5 = load32_le(b6);
+  uint32_t xk5 = u5;
+  uint32_t ti6 = _t[6U];
+  uint32_t
+  v5 =
+    vb6
+    +
+      ((va5 + ((vb6 & vc6) | (~vb6 & vd6)) + xk5 + ti6)
+      << (uint32_t)17U
+      | (va5 + ((vb6 & vc6) | (~vb6 & vd6)) + xk5 + ti6) >> (uint32_t)15U);
+  abcd[2U] = v5;
+  uint32_t va6 = abcd[1U];
+  uint32_t vb7 = abcd[2U];
+  uint32_t vc7 = abcd[3U];
+  uint32_t vd7 = abcd[0U];
+  uint8_t *b7 = x + (uint32_t)28U;
+  uint32_t u6 = load32_le(b7);
+  uint32_t xk6 = u6;
+  uint32_t ti7 = _t[7U];
+  uint32_t
+  v6 =
+    vb7
+    +
+      ((va6 + ((vb7 & vc7) | (~vb7 & vd7)) + xk6 + ti7)
+      << (uint32_t)22U
+      | (va6 + ((vb7 & vc7) | (~vb7 & vd7)) + xk6 + ti7) >> (uint32_t)10U);
+  abcd[1U] = v6;
+  uint32_t va7 = abcd[0U];
+  uint32_t vb8 = abcd[1U];
+  uint32_t vc8 = abcd[2U];
+  uint32_t vd8 = abcd[3U];
+  uint8_t *b8 = x + (uint32_t)32U;
+  uint32_t u7 = load32_le(b8);
+  uint32_t xk7 = u7;
+  uint32_t ti8 = _t[8U];
+  uint32_t
+  v7 =
+    vb8
+    +
+      ((va7 + ((vb8 & vc8) | (~vb8 & vd8)) + xk7 + ti8)
+      << (uint32_t)7U
+      | (va7 + ((vb8 & vc8) | (~vb8 & vd8)) + xk7 + ti8) >> (uint32_t)25U);
+  abcd[0U] = v7;
+  uint32_t va8 = abcd[3U];
+  uint32_t vb9 = abcd[0U];
+  uint32_t vc9 = abcd[1U];
+  uint32_t vd9 = abcd[2U];
+  uint8_t *b9 = x + (uint32_t)36U;
+  uint32_t u8 = load32_le(b9);
+  uint32_t xk8 = u8;
+  uint32_t ti9 = _t[9U];
+  uint32_t
+  v8 =
+    vb9
+    +
+      ((va8 + ((vb9 & vc9) | (~vb9 & vd9)) + xk8 + ti9)
+      << (uint32_t)12U
+      | (va8 + ((vb9 & vc9) | (~vb9 & vd9)) + xk8 + ti9) >> (uint32_t)20U);
+  abcd[3U] = v8;
+  uint32_t va9 = abcd[2U];
+  uint32_t vb10 = abcd[3U];
+  uint32_t vc10 = abcd[0U];
+  uint32_t vd10 = abcd[1U];
+  uint8_t *b10 = x + (uint32_t)40U;
+  uint32_t u9 = load32_le(b10);
+  uint32_t xk9 = u9;
+  uint32_t ti10 = _t[10U];
+  uint32_t
+  v9 =
+    vb10
+    +
+      ((va9 + ((vb10 & vc10) | (~vb10 & vd10)) + xk9 + ti10)
+      << (uint32_t)17U
+      | (va9 + ((vb10 & vc10) | (~vb10 & vd10)) + xk9 + ti10) >> (uint32_t)15U);
+  abcd[2U] = v9;
+  uint32_t va10 = abcd[1U];
+  uint32_t vb11 = abcd[2U];
+  uint32_t vc11 = abcd[3U];
+  uint32_t vd11 = abcd[0U];
+  uint8_t *b11 = x + (uint32_t)44U;
+  uint32_t u10 = load32_le(b11);
+  uint32_t xk10 = u10;
+  uint32_t ti11 = _t[11U];
+  uint32_t
+  v10 =
+    vb11
+    +
+      ((va10 + ((vb11 & vc11) | (~vb11 & vd11)) + xk10 + ti11)
+      << (uint32_t)22U
+      | (va10 + ((vb11 & vc11) | (~vb11 & vd11)) + xk10 + ti11) >> (uint32_t)10U);
+  abcd[1U] = v10;
+  uint32_t va11 = abcd[0U];
+  uint32_t vb12 = abcd[1U];
+  uint32_t vc12 = abcd[2U];
+  uint32_t vd12 = abcd[3U];
+  uint8_t *b12 = x + (uint32_t)48U;
+  uint32_t u11 = load32_le(b12);
+  uint32_t xk11 = u11;
+  uint32_t ti12 = _t[12U];
+  uint32_t
+  v11 =
+    vb12
+    +
+      ((va11 + ((vb12 & vc12) | (~vb12 & vd12)) + xk11 + ti12)
+      << (uint32_t)7U
+      | (va11 + ((vb12 & vc12) | (~vb12 & vd12)) + xk11 + ti12) >> (uint32_t)25U);
+  abcd[0U] = v11;
+  uint32_t va12 = abcd[3U];
+  uint32_t vb13 = abcd[0U];
+  uint32_t vc13 = abcd[1U];
+  uint32_t vd13 = abcd[2U];
+  uint8_t *b13 = x + (uint32_t)52U;
+  uint32_t u12 = load32_le(b13);
+  uint32_t xk12 = u12;
+  uint32_t ti13 = _t[13U];
+  uint32_t
+  v12 =
+    vb13
+    +
+      ((va12 + ((vb13 & vc13) | (~vb13 & vd13)) + xk12 + ti13)
+      << (uint32_t)12U
+      | (va12 + ((vb13 & vc13) | (~vb13 & vd13)) + xk12 + ti13) >> (uint32_t)20U);
+  abcd[3U] = v12;
+  uint32_t va13 = abcd[2U];
+  uint32_t vb14 = abcd[3U];
+  uint32_t vc14 = abcd[0U];
+  uint32_t vd14 = abcd[1U];
+  uint8_t *b14 = x + (uint32_t)56U;
+  uint32_t u13 = load32_le(b14);
+  uint32_t xk13 = u13;
+  uint32_t ti14 = _t[14U];
+  uint32_t
+  v13 =
+    vb14
+    +
+      ((va13 + ((vb14 & vc14) | (~vb14 & vd14)) + xk13 + ti14)
+      << (uint32_t)17U
+      | (va13 + ((vb14 & vc14) | (~vb14 & vd14)) + xk13 + ti14) >> (uint32_t)15U);
+  abcd[2U] = v13;
+  uint32_t va14 = abcd[1U];
+  uint32_t vb15 = abcd[2U];
+  uint32_t vc15 = abcd[3U];
+  uint32_t vd15 = abcd[0U];
+  uint8_t *b15 = x + (uint32_t)60U;
+  uint32_t u14 = load32_le(b15);
+  uint32_t xk14 = u14;
+  uint32_t ti15 = _t[15U];
+  uint32_t
+  v14 =
+    vb15
+    +
+      ((va14 + ((vb15 & vc15) | (~vb15 & vd15)) + xk14 + ti15)
+      << (uint32_t)22U
+      | (va14 + ((vb15 & vc15) | (~vb15 & vd15)) + xk14 + ti15) >> (uint32_t)10U);
+  abcd[1U] = v14;
+  uint32_t va15 = abcd[0U];
+  uint32_t vb16 = abcd[1U];
+  uint32_t vc16 = abcd[2U];
+  uint32_t vd16 = abcd[3U];
+  uint8_t *b16 = x + (uint32_t)4U;
+  uint32_t u15 = load32_le(b16);
+  uint32_t xk15 = u15;
+  uint32_t ti16 = _t[16U];
+  uint32_t
+  v15 =
+    vb16
+    +
+      ((va15 + ((vb16 & vd16) | (vc16 & ~vd16)) + xk15 + ti16)
+      << (uint32_t)5U
+      | (va15 + ((vb16 & vd16) | (vc16 & ~vd16)) + xk15 + ti16) >> (uint32_t)27U);
+  abcd[0U] = v15;
+  uint32_t va16 = abcd[3U];
+  uint32_t vb17 = abcd[0U];
+  uint32_t vc17 = abcd[1U];
+  uint32_t vd17 = abcd[2U];
+  uint8_t *b17 = x + (uint32_t)24U;
+  uint32_t u16 = load32_le(b17);
+  uint32_t xk16 = u16;
+  uint32_t ti17 = _t[17U];
+  uint32_t
+  v16 =
+    vb17
+    +
+      ((va16 + ((vb17 & vd17) | (vc17 & ~vd17)) + xk16 + ti17)
+      << (uint32_t)9U
+      | (va16 + ((vb17 & vd17) | (vc17 & ~vd17)) + xk16 + ti17) >> (uint32_t)23U);
+  abcd[3U] = v16;
+  uint32_t va17 = abcd[2U];
+  uint32_t vb18 = abcd[3U];
+  uint32_t vc18 = abcd[0U];
+  uint32_t vd18 = abcd[1U];
+  uint8_t *b18 = x + (uint32_t)44U;
+  uint32_t u17 = load32_le(b18);
+  uint32_t xk17 = u17;
+  uint32_t ti18 = _t[18U];
+  uint32_t
+  v17 =
+    vb18
+    +
+      ((va17 + ((vb18 & vd18) | (vc18 & ~vd18)) + xk17 + ti18)
+      << (uint32_t)14U
+      | (va17 + ((vb18 & vd18) | (vc18 & ~vd18)) + xk17 + ti18) >> (uint32_t)18U);
+  abcd[2U] = v17;
+  uint32_t va18 = abcd[1U];
+  uint32_t vb19 = abcd[2U];
+  uint32_t vc19 = abcd[3U];
+  uint32_t vd19 = abcd[0U];
+  uint8_t *b19 = x;
+  uint32_t u18 = load32_le(b19);
+  uint32_t xk18 = u18;
+  uint32_t ti19 = _t[19U];
+  uint32_t
+  v18 =
+    vb19
+    +
+      ((va18 + ((vb19 & vd19) | (vc19 & ~vd19)) + xk18 + ti19)
+      << (uint32_t)20U
+      | (va18 + ((vb19 & vd19) | (vc19 & ~vd19)) + xk18 + ti19) >> (uint32_t)12U);
+  abcd[1U] = v18;
+  uint32_t va19 = abcd[0U];
+  uint32_t vb20 = abcd[1U];
+  uint32_t vc20 = abcd[2U];
+  uint32_t vd20 = abcd[3U];
+  uint8_t *b20 = x + (uint32_t)20U;
+  uint32_t u19 = load32_le(b20);
+  uint32_t xk19 = u19;
+  uint32_t ti20 = _t[20U];
+  uint32_t
+  v19 =
+    vb20
+    +
+      ((va19 + ((vb20 & vd20) | (vc20 & ~vd20)) + xk19 + ti20)
+      << (uint32_t)5U
+      | (va19 + ((vb20 & vd20) | (vc20 & ~vd20)) + xk19 + ti20) >> (uint32_t)27U);
+  abcd[0U] = v19;
+  uint32_t va20 = abcd[3U];
+  uint32_t vb21 = abcd[0U];
+  uint32_t vc21 = abcd[1U];
+  uint32_t vd21 = abcd[2U];
+  uint8_t *b21 = x + (uint32_t)40U;
+  uint32_t u20 = load32_le(b21);
+  uint32_t xk20 = u20;
+  uint32_t ti21 = _t[21U];
+  uint32_t
+  v20 =
+    vb21
+    +
+      ((va20 + ((vb21 & vd21) | (vc21 & ~vd21)) + xk20 + ti21)
+      << (uint32_t)9U
+      | (va20 + ((vb21 & vd21) | (vc21 & ~vd21)) + xk20 + ti21) >> (uint32_t)23U);
+  abcd[3U] = v20;
+  uint32_t va21 = abcd[2U];
+  uint32_t vb22 = abcd[3U];
+  uint32_t vc22 = abcd[0U];
+  uint32_t vd22 = abcd[1U];
+  uint8_t *b22 = x + (uint32_t)60U;
+  uint32_t u21 = load32_le(b22);
+  uint32_t xk21 = u21;
+  uint32_t ti22 = _t[22U];
+  uint32_t
+  v21 =
+    vb22
+    +
+      ((va21 + ((vb22 & vd22) | (vc22 & ~vd22)) + xk21 + ti22)
+      << (uint32_t)14U
+      | (va21 + ((vb22 & vd22) | (vc22 & ~vd22)) + xk21 + ti22) >> (uint32_t)18U);
+  abcd[2U] = v21;
+  uint32_t va22 = abcd[1U];
+  uint32_t vb23 = abcd[2U];
+  uint32_t vc23 = abcd[3U];
+  uint32_t vd23 = abcd[0U];
+  uint8_t *b23 = x + (uint32_t)16U;
+  uint32_t u22 = load32_le(b23);
+  uint32_t xk22 = u22;
+  uint32_t ti23 = _t[23U];
+  uint32_t
+  v22 =
+    vb23
+    +
+      ((va22 + ((vb23 & vd23) | (vc23 & ~vd23)) + xk22 + ti23)
+      << (uint32_t)20U
+      | (va22 + ((vb23 & vd23) | (vc23 & ~vd23)) + xk22 + ti23) >> (uint32_t)12U);
+  abcd[1U] = v22;
+  uint32_t va23 = abcd[0U];
+  uint32_t vb24 = abcd[1U];
+  uint32_t vc24 = abcd[2U];
+  uint32_t vd24 = abcd[3U];
+  uint8_t *b24 = x + (uint32_t)36U;
+  uint32_t u23 = load32_le(b24);
+  uint32_t xk23 = u23;
+  uint32_t ti24 = _t[24U];
+  uint32_t
+  v23 =
+    vb24
+    +
+      ((va23 + ((vb24 & vd24) | (vc24 & ~vd24)) + xk23 + ti24)
+      << (uint32_t)5U
+      | (va23 + ((vb24 & vd24) | (vc24 & ~vd24)) + xk23 + ti24) >> (uint32_t)27U);
+  abcd[0U] = v23;
+  uint32_t va24 = abcd[3U];
+  uint32_t vb25 = abcd[0U];
+  uint32_t vc25 = abcd[1U];
+  uint32_t vd25 = abcd[2U];
+  uint8_t *b25 = x + (uint32_t)56U;
+  uint32_t u24 = load32_le(b25);
+  uint32_t xk24 = u24;
+  uint32_t ti25 = _t[25U];
+  uint32_t
+  v24 =
+    vb25
+    +
+      ((va24 + ((vb25 & vd25) | (vc25 & ~vd25)) + xk24 + ti25)
+      << (uint32_t)9U
+      | (va24 + ((vb25 & vd25) | (vc25 & ~vd25)) + xk24 + ti25) >> (uint32_t)23U);
+  abcd[3U] = v24;
+  uint32_t va25 = abcd[2U];
+  uint32_t vb26 = abcd[3U];
+  uint32_t vc26 = abcd[0U];
+  uint32_t vd26 = abcd[1U];
+  uint8_t *b26 = x + (uint32_t)12U;
+  uint32_t u25 = load32_le(b26);
+  uint32_t xk25 = u25;
+  uint32_t ti26 = _t[26U];
+  uint32_t
+  v25 =
+    vb26
+    +
+      ((va25 + ((vb26 & vd26) | (vc26 & ~vd26)) + xk25 + ti26)
+      << (uint32_t)14U
+      | (va25 + ((vb26 & vd26) | (vc26 & ~vd26)) + xk25 + ti26) >> (uint32_t)18U);
+  abcd[2U] = v25;
+  uint32_t va26 = abcd[1U];
+  uint32_t vb27 = abcd[2U];
+  uint32_t vc27 = abcd[3U];
+  uint32_t vd27 = abcd[0U];
+  uint8_t *b27 = x + (uint32_t)32U;
+  uint32_t u26 = load32_le(b27);
+  uint32_t xk26 = u26;
+  uint32_t ti27 = _t[27U];
+  uint32_t
+  v26 =
+    vb27
+    +
+      ((va26 + ((vb27 & vd27) | (vc27 & ~vd27)) + xk26 + ti27)
+      << (uint32_t)20U
+      | (va26 + ((vb27 & vd27) | (vc27 & ~vd27)) + xk26 + ti27) >> (uint32_t)12U);
+  abcd[1U] = v26;
+  uint32_t va27 = abcd[0U];
+  uint32_t vb28 = abcd[1U];
+  uint32_t vc28 = abcd[2U];
+  uint32_t vd28 = abcd[3U];
+  uint8_t *b28 = x + (uint32_t)52U;
+  uint32_t u27 = load32_le(b28);
+  uint32_t xk27 = u27;
+  uint32_t ti28 = _t[28U];
+  uint32_t
+  v27 =
+    vb28
+    +
+      ((va27 + ((vb28 & vd28) | (vc28 & ~vd28)) + xk27 + ti28)
+      << (uint32_t)5U
+      | (va27 + ((vb28 & vd28) | (vc28 & ~vd28)) + xk27 + ti28) >> (uint32_t)27U);
+  abcd[0U] = v27;
+  uint32_t va28 = abcd[3U];
+  uint32_t vb29 = abcd[0U];
+  uint32_t vc29 = abcd[1U];
+  uint32_t vd29 = abcd[2U];
+  uint8_t *b29 = x + (uint32_t)8U;
+  uint32_t u28 = load32_le(b29);
+  uint32_t xk28 = u28;
+  uint32_t ti29 = _t[29U];
+  uint32_t
+  v28 =
+    vb29
+    +
+      ((va28 + ((vb29 & vd29) | (vc29 & ~vd29)) + xk28 + ti29)
+      << (uint32_t)9U
+      | (va28 + ((vb29 & vd29) | (vc29 & ~vd29)) + xk28 + ti29) >> (uint32_t)23U);
+  abcd[3U] = v28;
+  uint32_t va29 = abcd[2U];
+  uint32_t vb30 = abcd[3U];
+  uint32_t vc30 = abcd[0U];
+  uint32_t vd30 = abcd[1U];
+  uint8_t *b30 = x + (uint32_t)28U;
+  uint32_t u29 = load32_le(b30);
+  uint32_t xk29 = u29;
+  uint32_t ti30 = _t[30U];
+  uint32_t
+  v29 =
+    vb30
+    +
+      ((va29 + ((vb30 & vd30) | (vc30 & ~vd30)) + xk29 + ti30)
+      << (uint32_t)14U
+      | (va29 + ((vb30 & vd30) | (vc30 & ~vd30)) + xk29 + ti30) >> (uint32_t)18U);
+  abcd[2U] = v29;
+  uint32_t va30 = abcd[1U];
+  uint32_t vb31 = abcd[2U];
+  uint32_t vc31 = abcd[3U];
+  uint32_t vd31 = abcd[0U];
+  uint8_t *b31 = x + (uint32_t)48U;
+  uint32_t u30 = load32_le(b31);
+  uint32_t xk30 = u30;
+  uint32_t ti31 = _t[31U];
+  uint32_t
+  v30 =
+    vb31
+    +
+      ((va30 + ((vb31 & vd31) | (vc31 & ~vd31)) + xk30 + ti31)
+      << (uint32_t)20U
+      | (va30 + ((vb31 & vd31) | (vc31 & ~vd31)) + xk30 + ti31) >> (uint32_t)12U);
+  abcd[1U] = v30;
+  uint32_t va31 = abcd[0U];
+  uint32_t vb32 = abcd[1U];
+  uint32_t vc32 = abcd[2U];
+  uint32_t vd32 = abcd[3U];
+  uint8_t *b32 = x + (uint32_t)20U;
+  uint32_t u31 = load32_le(b32);
+  uint32_t xk31 = u31;
+  uint32_t ti32 = _t[32U];
+  uint32_t
+  v31 =
+    vb32
+    +
+      ((va31 + (vb32 ^ (vc32 ^ vd32)) + xk31 + ti32)
+      << (uint32_t)4U
+      | (va31 + (vb32 ^ (vc32 ^ vd32)) + xk31 + ti32) >> (uint32_t)28U);
+  abcd[0U] = v31;
+  uint32_t va32 = abcd[3U];
+  uint32_t vb33 = abcd[0U];
+  uint32_t vc33 = abcd[1U];
+  uint32_t vd33 = abcd[2U];
+  uint8_t *b33 = x + (uint32_t)32U;
+  uint32_t u32 = load32_le(b33);
+  uint32_t xk32 = u32;
+  uint32_t ti33 = _t[33U];
+  uint32_t
+  v32 =
+    vb33
+    +
+      ((va32 + (vb33 ^ (vc33 ^ vd33)) + xk32 + ti33)
+      << (uint32_t)11U
+      | (va32 + (vb33 ^ (vc33 ^ vd33)) + xk32 + ti33) >> (uint32_t)21U);
+  abcd[3U] = v32;
+  uint32_t va33 = abcd[2U];
+  uint32_t vb34 = abcd[3U];
+  uint32_t vc34 = abcd[0U];
+  uint32_t vd34 = abcd[1U];
+  uint8_t *b34 = x + (uint32_t)44U;
+  uint32_t u33 = load32_le(b34);
+  uint32_t xk33 = u33;
+  uint32_t ti34 = _t[34U];
+  uint32_t
+  v33 =
+    vb34
+    +
+      ((va33 + (vb34 ^ (vc34 ^ vd34)) + xk33 + ti34)
+      << (uint32_t)16U
+      | (va33 + (vb34 ^ (vc34 ^ vd34)) + xk33 + ti34) >> (uint32_t)16U);
+  abcd[2U] = v33;
+  uint32_t va34 = abcd[1U];
+  uint32_t vb35 = abcd[2U];
+  uint32_t vc35 = abcd[3U];
+  uint32_t vd35 = abcd[0U];
+  uint8_t *b35 = x + (uint32_t)56U;
+  uint32_t u34 = load32_le(b35);
+  uint32_t xk34 = u34;
+  uint32_t ti35 = _t[35U];
+  uint32_t
+  v34 =
+    vb35
+    +
+      ((va34 + (vb35 ^ (vc35 ^ vd35)) + xk34 + ti35)
+      << (uint32_t)23U
+      | (va34 + (vb35 ^ (vc35 ^ vd35)) + xk34 + ti35) >> (uint32_t)9U);
+  abcd[1U] = v34;
+  uint32_t va35 = abcd[0U];
+  uint32_t vb36 = abcd[1U];
+  uint32_t vc36 = abcd[2U];
+  uint32_t vd36 = abcd[3U];
+  uint8_t *b36 = x + (uint32_t)4U;
+  uint32_t u35 = load32_le(b36);
+  uint32_t xk35 = u35;
+  uint32_t ti36 = _t[36U];
+  uint32_t
+  v35 =
+    vb36
+    +
+      ((va35 + (vb36 ^ (vc36 ^ vd36)) + xk35 + ti36)
+      << (uint32_t)4U
+      | (va35 + (vb36 ^ (vc36 ^ vd36)) + xk35 + ti36) >> (uint32_t)28U);
+  abcd[0U] = v35;
+  uint32_t va36 = abcd[3U];
+  uint32_t vb37 = abcd[0U];
+  uint32_t vc37 = abcd[1U];
+  uint32_t vd37 = abcd[2U];
+  uint8_t *b37 = x + (uint32_t)16U;
+  uint32_t u36 = load32_le(b37);
+  uint32_t xk36 = u36;
+  uint32_t ti37 = _t[37U];
+  uint32_t
+  v36 =
+    vb37
+    +
+      ((va36 + (vb37 ^ (vc37 ^ vd37)) + xk36 + ti37)
+      << (uint32_t)11U
+      | (va36 + (vb37 ^ (vc37 ^ vd37)) + xk36 + ti37) >> (uint32_t)21U);
+  abcd[3U] = v36;
+  uint32_t va37 = abcd[2U];
+  uint32_t vb38 = abcd[3U];
+  uint32_t vc38 = abcd[0U];
+  uint32_t vd38 = abcd[1U];
+  uint8_t *b38 = x + (uint32_t)28U;
+  uint32_t u37 = load32_le(b38);
+  uint32_t xk37 = u37;
+  uint32_t ti38 = _t[38U];
+  uint32_t
+  v37 =
+    vb38
+    +
+      ((va37 + (vb38 ^ (vc38 ^ vd38)) + xk37 + ti38)
+      << (uint32_t)16U
+      | (va37 + (vb38 ^ (vc38 ^ vd38)) + xk37 + ti38) >> (uint32_t)16U);
+  abcd[2U] = v37;
+  uint32_t va38 = abcd[1U];
+  uint32_t vb39 = abcd[2U];
+  uint32_t vc39 = abcd[3U];
+  uint32_t vd39 = abcd[0U];
+  uint8_t *b39 = x + (uint32_t)40U;
+  uint32_t u38 = load32_le(b39);
+  uint32_t xk38 = u38;
+  uint32_t ti39 = _t[39U];
+  uint32_t
+  v38 =
+    vb39
+    +
+      ((va38 + (vb39 ^ (vc39 ^ vd39)) + xk38 + ti39)
+      << (uint32_t)23U
+      | (va38 + (vb39 ^ (vc39 ^ vd39)) + xk38 + ti39) >> (uint32_t)9U);
+  abcd[1U] = v38;
+  uint32_t va39 = abcd[0U];
+  uint32_t vb40 = abcd[1U];
+  uint32_t vc40 = abcd[2U];
+  uint32_t vd40 = abcd[3U];
+  uint8_t *b40 = x + (uint32_t)52U;
+  uint32_t u39 = load32_le(b40);
+  uint32_t xk39 = u39;
+  uint32_t ti40 = _t[40U];
+  uint32_t
+  v39 =
+    vb40
+    +
+      ((va39 + (vb40 ^ (vc40 ^ vd40)) + xk39 + ti40)
+      << (uint32_t)4U
+      | (va39 + (vb40 ^ (vc40 ^ vd40)) + xk39 + ti40) >> (uint32_t)28U);
+  abcd[0U] = v39;
+  uint32_t va40 = abcd[3U];
+  uint32_t vb41 = abcd[0U];
+  uint32_t vc41 = abcd[1U];
+  uint32_t vd41 = abcd[2U];
+  uint8_t *b41 = x;
+  uint32_t u40 = load32_le(b41);
+  uint32_t xk40 = u40;
+  uint32_t ti41 = _t[41U];
+  uint32_t
+  v40 =
+    vb41
+    +
+      ((va40 + (vb41 ^ (vc41 ^ vd41)) + xk40 + ti41)
+      << (uint32_t)11U
+      | (va40 + (vb41 ^ (vc41 ^ vd41)) + xk40 + ti41) >> (uint32_t)21U);
+  abcd[3U] = v40;
+  uint32_t va41 = abcd[2U];
+  uint32_t vb42 = abcd[3U];
+  uint32_t vc42 = abcd[0U];
+  uint32_t vd42 = abcd[1U];
+  uint8_t *b42 = x + (uint32_t)12U;
+  uint32_t u41 = load32_le(b42);
+  uint32_t xk41 = u41;
+  uint32_t ti42 = _t[42U];
+  uint32_t
+  v41 =
+    vb42
+    +
+      ((va41 + (vb42 ^ (vc42 ^ vd42)) + xk41 + ti42)
+      << (uint32_t)16U
+      | (va41 + (vb42 ^ (vc42 ^ vd42)) + xk41 + ti42) >> (uint32_t)16U);
+  abcd[2U] = v41;
+  uint32_t va42 = abcd[1U];
+  uint32_t vb43 = abcd[2U];
+  uint32_t vc43 = abcd[3U];
+  uint32_t vd43 = abcd[0U];
+  uint8_t *b43 = x + (uint32_t)24U;
+  uint32_t u42 = load32_le(b43);
+  uint32_t xk42 = u42;
+  uint32_t ti43 = _t[43U];
+  uint32_t
+  v42 =
+    vb43
+    +
+      ((va42 + (vb43 ^ (vc43 ^ vd43)) + xk42 + ti43)
+      << (uint32_t)23U
+      | (va42 + (vb43 ^ (vc43 ^ vd43)) + xk42 + ti43) >> (uint32_t)9U);
+  abcd[1U] = v42;
+  uint32_t va43 = abcd[0U];
+  uint32_t vb44 = abcd[1U];
+  uint32_t vc44 = abcd[2U];
+  uint32_t vd44 = abcd[3U];
+  uint8_t *b44 = x + (uint32_t)36U;
+  uint32_t u43 = load32_le(b44);
+  uint32_t xk43 = u43;
+  uint32_t ti44 = _t[44U];
+  uint32_t
+  v43 =
+    vb44
+    +
+      ((va43 + (vb44 ^ (vc44 ^ vd44)) + xk43 + ti44)
+      << (uint32_t)4U
+      | (va43 + (vb44 ^ (vc44 ^ vd44)) + xk43 + ti44) >> (uint32_t)28U);
+  abcd[0U] = v43;
+  uint32_t va44 = abcd[3U];
+  uint32_t vb45 = abcd[0U];
+  uint32_t vc45 = abcd[1U];
+  uint32_t vd45 = abcd[2U];
+  uint8_t *b45 = x + (uint32_t)48U;
+  uint32_t u44 = load32_le(b45);
+  uint32_t xk44 = u44;
+  uint32_t ti45 = _t[45U];
+  uint32_t
+  v44 =
+    vb45
+    +
+      ((va44 + (vb45 ^ (vc45 ^ vd45)) + xk44 + ti45)
+      << (uint32_t)11U
+      | (va44 + (vb45 ^ (vc45 ^ vd45)) + xk44 + ti45) >> (uint32_t)21U);
+  abcd[3U] = v44;
+  uint32_t va45 = abcd[2U];
+  uint32_t vb46 = abcd[3U];
+  uint32_t vc46 = abcd[0U];
+  uint32_t vd46 = abcd[1U];
+  uint8_t *b46 = x + (uint32_t)60U;
+  uint32_t u45 = load32_le(b46);
+  uint32_t xk45 = u45;
+  uint32_t ti46 = _t[46U];
+  uint32_t
+  v45 =
+    vb46
+    +
+      ((va45 + (vb46 ^ (vc46 ^ vd46)) + xk45 + ti46)
+      << (uint32_t)16U
+      | (va45 + (vb46 ^ (vc46 ^ vd46)) + xk45 + ti46) >> (uint32_t)16U);
+  abcd[2U] = v45;
+  uint32_t va46 = abcd[1U];
+  uint32_t vb47 = abcd[2U];
+  uint32_t vc47 = abcd[3U];
+  uint32_t vd47 = abcd[0U];
+  uint8_t *b47 = x + (uint32_t)8U;
+  uint32_t u46 = load32_le(b47);
+  uint32_t xk46 = u46;
+  uint32_t ti47 = _t[47U];
+  uint32_t
+  v46 =
+    vb47
+    +
+      ((va46 + (vb47 ^ (vc47 ^ vd47)) + xk46 + ti47)
+      << (uint32_t)23U
+      | (va46 + (vb47 ^ (vc47 ^ vd47)) + xk46 + ti47) >> (uint32_t)9U);
+  abcd[1U] = v46;
+  uint32_t va47 = abcd[0U];
+  uint32_t vb48 = abcd[1U];
+  uint32_t vc48 = abcd[2U];
+  uint32_t vd48 = abcd[3U];
+  uint8_t *b48 = x;
+  uint32_t u47 = load32_le(b48);
+  uint32_t xk47 = u47;
+  uint32_t ti48 = _t[48U];
+  uint32_t
+  v47 =
+    vb48
+    +
+      ((va47 + (vc48 ^ (vb48 | ~vd48)) + xk47 + ti48)
+      << (uint32_t)6U
+      | (va47 + (vc48 ^ (vb48 | ~vd48)) + xk47 + ti48) >> (uint32_t)26U);
+  abcd[0U] = v47;
+  uint32_t va48 = abcd[3U];
+  uint32_t vb49 = abcd[0U];
+  uint32_t vc49 = abcd[1U];
+  uint32_t vd49 = abcd[2U];
+  uint8_t *b49 = x + (uint32_t)28U;
+  uint32_t u48 = load32_le(b49);
+  uint32_t xk48 = u48;
+  uint32_t ti49 = _t[49U];
+  uint32_t
+  v48 =
+    vb49
+    +
+      ((va48 + (vc49 ^ (vb49 | ~vd49)) + xk48 + ti49)
+      << (uint32_t)10U
+      | (va48 + (vc49 ^ (vb49 | ~vd49)) + xk48 + ti49) >> (uint32_t)22U);
+  abcd[3U] = v48;
+  uint32_t va49 = abcd[2U];
+  uint32_t vb50 = abcd[3U];
+  uint32_t vc50 = abcd[0U];
+  uint32_t vd50 = abcd[1U];
+  uint8_t *b50 = x + (uint32_t)56U;
+  uint32_t u49 = load32_le(b50);
+  uint32_t xk49 = u49;
+  uint32_t ti50 = _t[50U];
+  uint32_t
+  v49 =
+    vb50
+    +
+      ((va49 + (vc50 ^ (vb50 | ~vd50)) + xk49 + ti50)
+      << (uint32_t)15U
+      | (va49 + (vc50 ^ (vb50 | ~vd50)) + xk49 + ti50) >> (uint32_t)17U);
+  abcd[2U] = v49;
+  uint32_t va50 = abcd[1U];
+  uint32_t vb51 = abcd[2U];
+  uint32_t vc51 = abcd[3U];
+  uint32_t vd51 = abcd[0U];
+  uint8_t *b51 = x + (uint32_t)20U;
+  uint32_t u50 = load32_le(b51);
+  uint32_t xk50 = u50;
+  uint32_t ti51 = _t[51U];
+  uint32_t
+  v50 =
+    vb51
+    +
+      ((va50 + (vc51 ^ (vb51 | ~vd51)) + xk50 + ti51)
+      << (uint32_t)21U
+      | (va50 + (vc51 ^ (vb51 | ~vd51)) + xk50 + ti51) >> (uint32_t)11U);
+  abcd[1U] = v50;
+  uint32_t va51 = abcd[0U];
+  uint32_t vb52 = abcd[1U];
+  uint32_t vc52 = abcd[2U];
+  uint32_t vd52 = abcd[3U];
+  uint8_t *b52 = x + (uint32_t)48U;
+  uint32_t u51 = load32_le(b52);
+  uint32_t xk51 = u51;
+  uint32_t ti52 = _t[52U];
+  uint32_t
+  v51 =
+    vb52
+    +
+      ((va51 + (vc52 ^ (vb52 | ~vd52)) + xk51 + ti52)
+      << (uint32_t)6U
+      | (va51 + (vc52 ^ (vb52 | ~vd52)) + xk51 + ti52) >> (uint32_t)26U);
+  abcd[0U] = v51;
+  uint32_t va52 = abcd[3U];
+  uint32_t vb53 = abcd[0U];
+  uint32_t vc53 = abcd[1U];
+  uint32_t vd53 = abcd[2U];
+  uint8_t *b53 = x + (uint32_t)12U;
+  uint32_t u52 = load32_le(b53);
+  uint32_t xk52 = u52;
+  uint32_t ti53 = _t[53U];
+  uint32_t
+  v52 =
+    vb53
+    +
+      ((va52 + (vc53 ^ (vb53 | ~vd53)) + xk52 + ti53)
+      << (uint32_t)10U
+      | (va52 + (vc53 ^ (vb53 | ~vd53)) + xk52 + ti53) >> (uint32_t)22U);
+  abcd[3U] = v52;
+  uint32_t va53 = abcd[2U];
+  uint32_t vb54 = abcd[3U];
+  uint32_t vc54 = abcd[0U];
+  uint32_t vd54 = abcd[1U];
+  uint8_t *b54 = x + (uint32_t)40U;
+  uint32_t u53 = load32_le(b54);
+  uint32_t xk53 = u53;
+  uint32_t ti54 = _t[54U];
+  uint32_t
+  v53 =
+    vb54
+    +
+      ((va53 + (vc54 ^ (vb54 | ~vd54)) + xk53 + ti54)
+      << (uint32_t)15U
+      | (va53 + (vc54 ^ (vb54 | ~vd54)) + xk53 + ti54) >> (uint32_t)17U);
+  abcd[2U] = v53;
+  uint32_t va54 = abcd[1U];
+  uint32_t vb55 = abcd[2U];
+  uint32_t vc55 = abcd[3U];
+  uint32_t vd55 = abcd[0U];
+  uint8_t *b55 = x + (uint32_t)4U;
+  uint32_t u54 = load32_le(b55);
+  uint32_t xk54 = u54;
+  uint32_t ti55 = _t[55U];
+  uint32_t
+  v54 =
+    vb55
+    +
+      ((va54 + (vc55 ^ (vb55 | ~vd55)) + xk54 + ti55)
+      << (uint32_t)21U
+      | (va54 + (vc55 ^ (vb55 | ~vd55)) + xk54 + ti55) >> (uint32_t)11U);
+  abcd[1U] = v54;
+  uint32_t va55 = abcd[0U];
+  uint32_t vb56 = abcd[1U];
+  uint32_t vc56 = abcd[2U];
+  uint32_t vd56 = abcd[3U];
+  uint8_t *b56 = x + (uint32_t)32U;
+  uint32_t u55 = load32_le(b56);
+  uint32_t xk55 = u55;
+  uint32_t ti56 = _t[56U];
+  uint32_t
+  v55 =
+    vb56
+    +
+      ((va55 + (vc56 ^ (vb56 | ~vd56)) + xk55 + ti56)
+      << (uint32_t)6U
+      | (va55 + (vc56 ^ (vb56 | ~vd56)) + xk55 + ti56) >> (uint32_t)26U);
+  abcd[0U] = v55;
+  uint32_t va56 = abcd[3U];
+  uint32_t vb57 = abcd[0U];
+  uint32_t vc57 = abcd[1U];
+  uint32_t vd57 = abcd[2U];
+  uint8_t *b57 = x + (uint32_t)60U;
+  uint32_t u56 = load32_le(b57);
+  uint32_t xk56 = u56;
+  uint32_t ti57 = _t[57U];
+  uint32_t
+  v56 =
+    vb57
+    +
+      ((va56 + (vc57 ^ (vb57 | ~vd57)) + xk56 + ti57)
+      << (uint32_t)10U
+      | (va56 + (vc57 ^ (vb57 | ~vd57)) + xk56 + ti57) >> (uint32_t)22U);
+  abcd[3U] = v56;
+  uint32_t va57 = abcd[2U];
+  uint32_t vb58 = abcd[3U];
+  uint32_t vc58 = abcd[0U];
+  uint32_t vd58 = abcd[1U];
+  uint8_t *b58 = x + (uint32_t)24U;
+  uint32_t u57 = load32_le(b58);
+  uint32_t xk57 = u57;
+  uint32_t ti58 = _t[58U];
+  uint32_t
+  v57 =
+    vb58
+    +
+      ((va57 + (vc58 ^ (vb58 | ~vd58)) + xk57 + ti58)
+      << (uint32_t)15U
+      | (va57 + (vc58 ^ (vb58 | ~vd58)) + xk57 + ti58) >> (uint32_t)17U);
+  abcd[2U] = v57;
+  uint32_t va58 = abcd[1U];
+  uint32_t vb59 = abcd[2U];
+  uint32_t vc59 = abcd[3U];
+  uint32_t vd59 = abcd[0U];
+  uint8_t *b59 = x + (uint32_t)52U;
+  uint32_t u58 = load32_le(b59);
+  uint32_t xk58 = u58;
+  uint32_t ti59 = _t[59U];
+  uint32_t
+  v58 =
+    vb59
+    +
+      ((va58 + (vc59 ^ (vb59 | ~vd59)) + xk58 + ti59)
+      << (uint32_t)21U
+      | (va58 + (vc59 ^ (vb59 | ~vd59)) + xk58 + ti59) >> (uint32_t)11U);
+  abcd[1U] = v58;
+  uint32_t va59 = abcd[0U];
+  uint32_t vb60 = abcd[1U];
+  uint32_t vc60 = abcd[2U];
+  uint32_t vd60 = abcd[3U];
+  uint8_t *b60 = x + (uint32_t)16U;
+  uint32_t u59 = load32_le(b60);
+  uint32_t xk59 = u59;
+  uint32_t ti60 = _t[60U];
+  uint32_t
+  v59 =
+    vb60
+    +
+      ((va59 + (vc60 ^ (vb60 | ~vd60)) + xk59 + ti60)
+      << (uint32_t)6U
+      | (va59 + (vc60 ^ (vb60 | ~vd60)) + xk59 + ti60) >> (uint32_t)26U);
+  abcd[0U] = v59;
+  uint32_t va60 = abcd[3U];
+  uint32_t vb61 = abcd[0U];
+  uint32_t vc61 = abcd[1U];
+  uint32_t vd61 = abcd[2U];
+  uint8_t *b61 = x + (uint32_t)44U;
+  uint32_t u60 = load32_le(b61);
+  uint32_t xk60 = u60;
+  uint32_t ti61 = _t[61U];
+  uint32_t
+  v60 =
+    vb61
+    +
+      ((va60 + (vc61 ^ (vb61 | ~vd61)) + xk60 + ti61)
+      << (uint32_t)10U
+      | (va60 + (vc61 ^ (vb61 | ~vd61)) + xk60 + ti61) >> (uint32_t)22U);
+  abcd[3U] = v60;
+  uint32_t va61 = abcd[2U];
+  uint32_t vb62 = abcd[3U];
+  uint32_t vc62 = abcd[0U];
+  uint32_t vd62 = abcd[1U];
+  uint8_t *b62 = x + (uint32_t)8U;
+  uint32_t u61 = load32_le(b62);
+  uint32_t xk61 = u61;
+  uint32_t ti62 = _t[62U];
+  uint32_t
+  v61 =
+    vb62
+    +
+      ((va61 + (vc62 ^ (vb62 | ~vd62)) + xk61 + ti62)
+      << (uint32_t)15U
+      | (va61 + (vc62 ^ (vb62 | ~vd62)) + xk61 + ti62) >> (uint32_t)17U);
+  abcd[2U] = v61;
+  uint32_t va62 = abcd[1U];
+  uint32_t vb = abcd[2U];
+  uint32_t vc = abcd[3U];
+  uint32_t vd = abcd[0U];
+  uint8_t *b63 = x + (uint32_t)36U;
+  uint32_t u62 = load32_le(b63);
+  uint32_t xk62 = u62;
+  uint32_t ti = _t[63U];
+  uint32_t
+  v62 =
+    vb
+    +
+      ((va62 + (vc ^ (vb | ~vd)) + xk62 + ti)
+      << (uint32_t)21U
+      | (va62 + (vc ^ (vb | ~vd)) + xk62 + ti) >> (uint32_t)11U);
+  abcd[1U] = v62;
+  uint32_t a = abcd[0U];
+  uint32_t b = abcd[1U];
+  uint32_t c = abcd[2U];
+  uint32_t d = abcd[3U];
+  abcd[0U] = a + aa;
+  abcd[1U] = b + bb;
+  abcd[2U] = c + cc;
+  abcd[3U] = d + dd;
+}
+
+static void legacy_pad(uint64_t len, uint8_t *dst)
+{
+  uint8_t *dst1 = dst;
+  dst1[0U] = (uint8_t)0x80U;
+  uint8_t *dst2 = dst + (uint32_t)1U;
+  for
+  (uint32_t
+    i = (uint32_t)0U;
+    i
+    < ((uint32_t)128U - ((uint32_t)9U + (uint32_t)(len % (uint64_t)(uint32_t)64U))) % (uint32_t)64U;
+    i++)
+  {
+    dst2[i] = (uint8_t)0U;
+  }
+  uint8_t
+  *dst3 =
+    dst
+    +
+      (uint32_t)1U
+      +
+        ((uint32_t)128U - ((uint32_t)9U + (uint32_t)(len % (uint64_t)(uint32_t)64U)))
+        % (uint32_t)64U;
+  store64_le(dst3, len << (uint32_t)3U);
+}
+
+void Hacl_Hash_Core_MD5_legacy_finish(uint32_t *s, uint8_t *dst)
+{
+  KRML_MAYBE_FOR4(i,
+    (uint32_t)0U,
+    (uint32_t)4U,
+    (uint32_t)1U,
+    store32_le(dst + i * (uint32_t)4U, s[i]););
+}
+
+void Hacl_Hash_MD5_legacy_update_multi(uint32_t *s, uint8_t *blocks, uint32_t n_blocks)
+{
+  for (uint32_t i = (uint32_t)0U; i < n_blocks; i++)
+  {
+    uint32_t sz = (uint32_t)64U;
+    uint8_t *block = blocks + sz * i;
+    legacy_update(s, block);
+  }
+}
+
+void
+Hacl_Hash_MD5_legacy_update_last(
+  uint32_t *s,
+  uint64_t prev_len,
+  uint8_t *input,
+  uint32_t input_len
+)
+{
+  uint32_t blocks_n = input_len / (uint32_t)64U;
+  uint32_t blocks_len = blocks_n * (uint32_t)64U;
+  uint8_t *blocks = input;
+  uint32_t rest_len = input_len - blocks_len;
+  uint8_t *rest = input + blocks_len;
+  Hacl_Hash_MD5_legacy_update_multi(s, blocks, blocks_n);
+  uint64_t total_input_len = prev_len + (uint64_t)input_len;
+  uint32_t
+  pad_len =
+    (uint32_t)1U
+    +
+      ((uint32_t)128U - ((uint32_t)9U + (uint32_t)(total_input_len % (uint64_t)(uint32_t)64U)))
+      % (uint32_t)64U
+    + (uint32_t)8U;
+  uint32_t tmp_len = rest_len + pad_len;
+  uint8_t tmp_twoblocks[128U] = { 0U };
+  uint8_t *tmp = tmp_twoblocks;
+  uint8_t *tmp_rest = tmp;
+  uint8_t *tmp_pad = tmp + rest_len;
+  memcpy(tmp_rest, rest, rest_len * sizeof (uint8_t));
+  legacy_pad(total_input_len, tmp_pad);
+  Hacl_Hash_MD5_legacy_update_multi(s, tmp, tmp_len / (uint32_t)64U);
+}
+
+void Hacl_Hash_MD5_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst)
+{
+  uint32_t
+  s[4U] =
+    { (uint32_t)0x67452301U, (uint32_t)0xefcdab89U, (uint32_t)0x98badcfeU, (uint32_t)0x10325476U };
+  uint32_t blocks_n0 = input_len / (uint32_t)64U;
+  uint32_t blocks_n1;
+  if (input_len % (uint32_t)64U == (uint32_t)0U && blocks_n0 > (uint32_t)0U)
+  {
+    blocks_n1 = blocks_n0 - (uint32_t)1U;
+  }
+  else
+  {
+    blocks_n1 = blocks_n0;
+  }
+  uint32_t blocks_len0 = blocks_n1 * (uint32_t)64U;
+  uint8_t *blocks0 = input;
+  uint32_t rest_len0 = input_len - blocks_len0;
+  uint8_t *rest0 = input + blocks_len0;
+  uint32_t blocks_n = blocks_n1;
+  uint32_t blocks_len = blocks_len0;
+  uint8_t *blocks = blocks0;
+  uint32_t rest_len = rest_len0;
+  uint8_t *rest = rest0;
+  Hacl_Hash_MD5_legacy_update_multi(s, blocks, blocks_n);
+  Hacl_Hash_MD5_legacy_update_last(s, (uint64_t)blocks_len, rest, rest_len);
+  Hacl_Hash_Core_MD5_legacy_finish(s, dst);
+}
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_MD5_legacy_create_in(void)
+{
+  uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
+  uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)4U, sizeof (uint32_t));
+  Hacl_Streaming_MD_state_32
+  s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
+  p[0U] = s;
+  Hacl_Hash_Core_MD5_legacy_init(block_state);
+  return p;
+}
+
+void Hacl_Streaming_MD5_legacy_init(Hacl_Streaming_MD_state_32 *s)
+{
+  Hacl_Streaming_MD_state_32 scrut = *s;
+  uint8_t *buf = scrut.buf;
+  uint32_t *block_state = scrut.block_state;
+  Hacl_Hash_Core_MD5_legacy_init(block_state);
+  Hacl_Streaming_MD_state_32
+  tmp = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
+  s[0U] = tmp;
+}
+
+/**
+0 = success, 1 = max length exceeded
+*/
+uint32_t
+Hacl_Streaming_MD5_legacy_update(Hacl_Streaming_MD_state_32 *p, uint8_t *data, uint32_t len)
+{
+  Hacl_Streaming_MD_state_32 s = *p;
+  uint64_t total_len = s.total_len;
+  if ((uint64_t)len > (uint64_t)2305843009213693951U - total_len)
+  {
+    return (uint32_t)1U;
+  }
+  uint32_t sz;
+  if (total_len % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len > (uint64_t)0U)
+  {
+    sz = (uint32_t)64U;
+  }
+  else
+  {
+    sz = (uint32_t)(total_len % (uint64_t)(uint32_t)64U);
+  }
+  if (len <= (uint32_t)64U - sz)
+  {
+    Hacl_Streaming_MD_state_32 s1 = *p;
+    uint32_t *block_state1 = s1.block_state;
+    uint8_t *buf = s1.buf;
+    uint64_t total_len1 = s1.total_len;
+    uint32_t sz1;
+    if (total_len1 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len1 > (uint64_t)0U)
+    {
+      sz1 = (uint32_t)64U;
+    }
+    else
+    {
+      sz1 = (uint32_t)(total_len1 % (uint64_t)(uint32_t)64U);
+    }
+    uint8_t *buf2 = buf + sz1;
+    memcpy(buf2, data, len * sizeof (uint8_t));
+    uint64_t total_len2 = total_len1 + (uint64_t)len;
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state1,
+          .buf = buf,
+          .total_len = total_len2
+        }
+      );
+  }
+  else if (sz == (uint32_t)0U)
+  {
+    Hacl_Streaming_MD_state_32 s1 = *p;
+    uint32_t *block_state1 = s1.block_state;
+    uint8_t *buf = s1.buf;
+    uint64_t total_len1 = s1.total_len;
+    uint32_t sz1;
+    if (total_len1 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len1 > (uint64_t)0U)
+    {
+      sz1 = (uint32_t)64U;
+    }
+    else
+    {
+      sz1 = (uint32_t)(total_len1 % (uint64_t)(uint32_t)64U);
+    }
+    if (!(sz1 == (uint32_t)0U))
+    {
+      Hacl_Hash_MD5_legacy_update_multi(block_state1, buf, (uint32_t)1U);
+    }
+    uint32_t ite;
+    if ((uint64_t)len % (uint64_t)(uint32_t)64U == (uint64_t)0U && (uint64_t)len > (uint64_t)0U)
+    {
+      ite = (uint32_t)64U;
+    }
+    else
+    {
+      ite = (uint32_t)((uint64_t)len % (uint64_t)(uint32_t)64U);
+    }
+    uint32_t n_blocks = (len - ite) / (uint32_t)64U;
+    uint32_t data1_len = n_blocks * (uint32_t)64U;
+    uint32_t data2_len = len - data1_len;
+    uint8_t *data1 = data;
+    uint8_t *data2 = data + data1_len;
+    Hacl_Hash_MD5_legacy_update_multi(block_state1, data1, data1_len / (uint32_t)64U);
+    uint8_t *dst = buf;
+    memcpy(dst, data2, data2_len * sizeof (uint8_t));
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state1,
+          .buf = buf,
+          .total_len = total_len1 + (uint64_t)len
+        }
+      );
+  }
+  else
+  {
+    uint32_t diff = (uint32_t)64U - sz;
+    uint8_t *data1 = data;
+    uint8_t *data2 = data + diff;
+    Hacl_Streaming_MD_state_32 s1 = *p;
+    uint32_t *block_state10 = s1.block_state;
+    uint8_t *buf0 = s1.buf;
+    uint64_t total_len10 = s1.total_len;
+    uint32_t sz10;
+    if (total_len10 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len10 > (uint64_t)0U)
+    {
+      sz10 = (uint32_t)64U;
+    }
+    else
+    {
+      sz10 = (uint32_t)(total_len10 % (uint64_t)(uint32_t)64U);
+    }
+    uint8_t *buf2 = buf0 + sz10;
+    memcpy(buf2, data1, diff * sizeof (uint8_t));
+    uint64_t total_len2 = total_len10 + (uint64_t)diff;
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state10,
+          .buf = buf0,
+          .total_len = total_len2
+        }
+      );
+    Hacl_Streaming_MD_state_32 s10 = *p;
+    uint32_t *block_state1 = s10.block_state;
+    uint8_t *buf = s10.buf;
+    uint64_t total_len1 = s10.total_len;
+    uint32_t sz1;
+    if (total_len1 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len1 > (uint64_t)0U)
+    {
+      sz1 = (uint32_t)64U;
+    }
+    else
+    {
+      sz1 = (uint32_t)(total_len1 % (uint64_t)(uint32_t)64U);
+    }
+    if (!(sz1 == (uint32_t)0U))
+    {
+      Hacl_Hash_MD5_legacy_update_multi(block_state1, buf, (uint32_t)1U);
+    }
+    uint32_t ite;
+    if
+    (
+      (uint64_t)(len - diff)
+      % (uint64_t)(uint32_t)64U
+      == (uint64_t)0U
+      && (uint64_t)(len - diff) > (uint64_t)0U
+    )
+    {
+      ite = (uint32_t)64U;
+    }
+    else
+    {
+      ite = (uint32_t)((uint64_t)(len - diff) % (uint64_t)(uint32_t)64U);
+    }
+    uint32_t n_blocks = (len - diff - ite) / (uint32_t)64U;
+    uint32_t data1_len = n_blocks * (uint32_t)64U;
+    uint32_t data2_len = len - diff - data1_len;
+    uint8_t *data11 = data2;
+    uint8_t *data21 = data2 + data1_len;
+    Hacl_Hash_MD5_legacy_update_multi(block_state1, data11, data1_len / (uint32_t)64U);
+    uint8_t *dst = buf;
+    memcpy(dst, data21, data2_len * sizeof (uint8_t));
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state1,
+          .buf = buf,
+          .total_len = total_len1 + (uint64_t)(len - diff)
+        }
+      );
+  }
+  return (uint32_t)0U;
+}
+
+void Hacl_Streaming_MD5_legacy_finish(Hacl_Streaming_MD_state_32 *p, uint8_t *dst)
+{
+  Hacl_Streaming_MD_state_32 scrut = *p;
+  uint32_t *block_state = scrut.block_state;
+  uint8_t *buf_ = scrut.buf;
+  uint64_t total_len = scrut.total_len;
+  uint32_t r;
+  if (total_len % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len > (uint64_t)0U)
+  {
+    r = (uint32_t)64U;
+  }
+  else
+  {
+    r = (uint32_t)(total_len % (uint64_t)(uint32_t)64U);
+  }
+  uint8_t *buf_1 = buf_;
+  uint32_t tmp_block_state[4U] = { 0U };
+  memcpy(tmp_block_state, block_state, (uint32_t)4U * sizeof (uint32_t));
+  uint32_t ite;
+  if (r % (uint32_t)64U == (uint32_t)0U && r > (uint32_t)0U)
+  {
+    ite = (uint32_t)64U;
+  }
+  else
+  {
+    ite = r % (uint32_t)64U;
+  }
+  uint8_t *buf_last = buf_1 + r - ite;
+  uint8_t *buf_multi = buf_1;
+  Hacl_Hash_MD5_legacy_update_multi(tmp_block_state, buf_multi, (uint32_t)0U);
+  uint64_t prev_len_last = total_len - (uint64_t)r;
+  Hacl_Hash_MD5_legacy_update_last(tmp_block_state, prev_len_last, buf_last, r);
+  Hacl_Hash_Core_MD5_legacy_finish(tmp_block_state, dst);
+}
+
+void Hacl_Streaming_MD5_legacy_free(Hacl_Streaming_MD_state_32 *s)
+{
+  Hacl_Streaming_MD_state_32 scrut = *s;
+  uint8_t *buf = scrut.buf;
+  uint32_t *block_state = scrut.block_state;
+  KRML_HOST_FREE(block_state);
+  KRML_HOST_FREE(buf);
+  KRML_HOST_FREE(s);
+}
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_MD5_legacy_copy(Hacl_Streaming_MD_state_32 *s0)
+{
+  Hacl_Streaming_MD_state_32 scrut = *s0;
+  uint32_t *block_state0 = scrut.block_state;
+  uint8_t *buf0 = scrut.buf;
+  uint64_t total_len0 = scrut.total_len;
+  uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
+  memcpy(buf, buf0, (uint32_t)64U * sizeof (uint8_t));
+  uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)4U, sizeof (uint32_t));
+  memcpy(block_state, block_state0, (uint32_t)4U * sizeof (uint32_t));
+  Hacl_Streaming_MD_state_32
+  s = { .block_state = block_state, .buf = buf, .total_len = total_len0 };
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
+  p[0U] = s;
+  return p;
+}
+
+void Hacl_Streaming_MD5_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst)
+{
+  Hacl_Hash_MD5_legacy_hash(input, input_len, dst);
+}
+
diff --git a/Modules/_hacl/Hacl_Hash_MD5.h b/Modules/_hacl/Hacl_Hash_MD5.h
new file mode 100644
index 0000000..015e366
--- /dev/null
+++ b/Modules/_hacl/Hacl_Hash_MD5.h
@@ -0,0 +1,65 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#ifndef __Hacl_Hash_MD5_H
+#define __Hacl_Hash_MD5_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <string.h>
+#include "krml/types.h"
+#include "krml/lowstar_endianness.h"
+#include "krml/internal/target.h"
+
+#include "Hacl_Streaming_Types.h"
+
+typedef Hacl_Streaming_MD_state_32 Hacl_Streaming_MD5_state;
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_MD5_legacy_create_in(void);
+
+void Hacl_Streaming_MD5_legacy_init(Hacl_Streaming_MD_state_32 *s);
+
+/**
+0 = success, 1 = max length exceeded
+*/
+uint32_t
+Hacl_Streaming_MD5_legacy_update(Hacl_Streaming_MD_state_32 *p, uint8_t *data, uint32_t len);
+
+void Hacl_Streaming_MD5_legacy_finish(Hacl_Streaming_MD_state_32 *p, uint8_t *dst);
+
+void Hacl_Streaming_MD5_legacy_free(Hacl_Streaming_MD_state_32 *s);
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_MD5_legacy_copy(Hacl_Streaming_MD_state_32 *s0);
+
+void Hacl_Streaming_MD5_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#define __Hacl_Hash_MD5_H_DEFINED
+#endif
diff --git a/Modules/_hacl/Hacl_Hash_SHA1.c b/Modules/_hacl/Hacl_Hash_SHA1.c
new file mode 100644
index 0000000..e155e33
--- /dev/null
+++ b/Modules/_hacl/Hacl_Hash_SHA1.c
@@ -0,0 +1,508 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#include "internal/Hacl_Hash_SHA1.h"
+
+static uint32_t
+_h0[5U] =
+  {
+    (uint32_t)0x67452301U, (uint32_t)0xefcdab89U, (uint32_t)0x98badcfeU, (uint32_t)0x10325476U,
+    (uint32_t)0xc3d2e1f0U
+  };
+
+void Hacl_Hash_Core_SHA1_legacy_init(uint32_t *s)
+{
+  KRML_MAYBE_FOR5(i, (uint32_t)0U, (uint32_t)5U, (uint32_t)1U, s[i] = _h0[i];);
+}
+
+static void legacy_update(uint32_t *h, uint8_t *l)
+{
+  uint32_t ha = h[0U];
+  uint32_t hb = h[1U];
+  uint32_t hc = h[2U];
+  uint32_t hd = h[3U];
+  uint32_t he = h[4U];
+  uint32_t _w[80U] = { 0U };
+  for (uint32_t i = (uint32_t)0U; i < (uint32_t)80U; i++)
+  {
+    uint32_t v;
+    if (i < (uint32_t)16U)
+    {
+      uint8_t *b = l + i * (uint32_t)4U;
+      uint32_t u = load32_be(b);
+      v = u;
+    }
+    else
+    {
+      uint32_t wmit3 = _w[i - (uint32_t)3U];
+      uint32_t wmit8 = _w[i - (uint32_t)8U];
+      uint32_t wmit14 = _w[i - (uint32_t)14U];
+      uint32_t wmit16 = _w[i - (uint32_t)16U];
+      v =
+        (wmit3 ^ (wmit8 ^ (wmit14 ^ wmit16)))
+        << (uint32_t)1U
+        | (wmit3 ^ (wmit8 ^ (wmit14 ^ wmit16))) >> (uint32_t)31U;
+    }
+    _w[i] = v;
+  }
+  for (uint32_t i = (uint32_t)0U; i < (uint32_t)80U; i++)
+  {
+    uint32_t _a = h[0U];
+    uint32_t _b = h[1U];
+    uint32_t _c = h[2U];
+    uint32_t _d = h[3U];
+    uint32_t _e = h[4U];
+    uint32_t wmit = _w[i];
+    uint32_t ite0;
+    if (i < (uint32_t)20U)
+    {
+      ite0 = (_b & _c) ^ (~_b & _d);
+    }
+    else if ((uint32_t)39U < i && i < (uint32_t)60U)
+    {
+      ite0 = (_b & _c) ^ ((_b & _d) ^ (_c & _d));
+    }
+    else
+    {
+      ite0 = _b ^ (_c ^ _d);
+    }
+    uint32_t ite;
+    if (i < (uint32_t)20U)
+    {
+      ite = (uint32_t)0x5a827999U;
+    }
+    else if (i < (uint32_t)40U)
+    {
+      ite = (uint32_t)0x6ed9eba1U;
+    }
+    else if (i < (uint32_t)60U)
+    {
+      ite = (uint32_t)0x8f1bbcdcU;
+    }
+    else
+    {
+      ite = (uint32_t)0xca62c1d6U;
+    }
+    uint32_t _T = (_a << (uint32_t)5U | _a >> (uint32_t)27U) + ite0 + _e + ite + wmit;
+    h[0U] = _T;
+    h[1U] = _a;
+    h[2U] = _b << (uint32_t)30U | _b >> (uint32_t)2U;
+    h[3U] = _c;
+    h[4U] = _d;
+  }
+  for (uint32_t i = (uint32_t)0U; i < (uint32_t)80U; i++)
+  {
+    _w[i] = (uint32_t)0U;
+  }
+  uint32_t sta = h[0U];
+  uint32_t stb = h[1U];
+  uint32_t stc = h[2U];
+  uint32_t std = h[3U];
+  uint32_t ste = h[4U];
+  h[0U] = sta + ha;
+  h[1U] = stb + hb;
+  h[2U] = stc + hc;
+  h[3U] = std + hd;
+  h[4U] = ste + he;
+}
+
+static void legacy_pad(uint64_t len, uint8_t *dst)
+{
+  uint8_t *dst1 = dst;
+  dst1[0U] = (uint8_t)0x80U;
+  uint8_t *dst2 = dst + (uint32_t)1U;
+  for
+  (uint32_t
+    i = (uint32_t)0U;
+    i
+    < ((uint32_t)128U - ((uint32_t)9U + (uint32_t)(len % (uint64_t)(uint32_t)64U))) % (uint32_t)64U;
+    i++)
+  {
+    dst2[i] = (uint8_t)0U;
+  }
+  uint8_t
+  *dst3 =
+    dst
+    +
+      (uint32_t)1U
+      +
+        ((uint32_t)128U - ((uint32_t)9U + (uint32_t)(len % (uint64_t)(uint32_t)64U)))
+        % (uint32_t)64U;
+  store64_be(dst3, len << (uint32_t)3U);
+}
+
+void Hacl_Hash_Core_SHA1_legacy_finish(uint32_t *s, uint8_t *dst)
+{
+  KRML_MAYBE_FOR5(i,
+    (uint32_t)0U,
+    (uint32_t)5U,
+    (uint32_t)1U,
+    store32_be(dst + i * (uint32_t)4U, s[i]););
+}
+
+void Hacl_Hash_SHA1_legacy_update_multi(uint32_t *s, uint8_t *blocks, uint32_t n_blocks)
+{
+  for (uint32_t i = (uint32_t)0U; i < n_blocks; i++)
+  {
+    uint32_t sz = (uint32_t)64U;
+    uint8_t *block = blocks + sz * i;
+    legacy_update(s, block);
+  }
+}
+
+void
+Hacl_Hash_SHA1_legacy_update_last(
+  uint32_t *s,
+  uint64_t prev_len,
+  uint8_t *input,
+  uint32_t input_len
+)
+{
+  uint32_t blocks_n = input_len / (uint32_t)64U;
+  uint32_t blocks_len = blocks_n * (uint32_t)64U;
+  uint8_t *blocks = input;
+  uint32_t rest_len = input_len - blocks_len;
+  uint8_t *rest = input + blocks_len;
+  Hacl_Hash_SHA1_legacy_update_multi(s, blocks, blocks_n);
+  uint64_t total_input_len = prev_len + (uint64_t)input_len;
+  uint32_t
+  pad_len =
+    (uint32_t)1U
+    +
+      ((uint32_t)128U - ((uint32_t)9U + (uint32_t)(total_input_len % (uint64_t)(uint32_t)64U)))
+      % (uint32_t)64U
+    + (uint32_t)8U;
+  uint32_t tmp_len = rest_len + pad_len;
+  uint8_t tmp_twoblocks[128U] = { 0U };
+  uint8_t *tmp = tmp_twoblocks;
+  uint8_t *tmp_rest = tmp;
+  uint8_t *tmp_pad = tmp + rest_len;
+  memcpy(tmp_rest, rest, rest_len * sizeof (uint8_t));
+  legacy_pad(total_input_len, tmp_pad);
+  Hacl_Hash_SHA1_legacy_update_multi(s, tmp, tmp_len / (uint32_t)64U);
+}
+
+void Hacl_Hash_SHA1_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst)
+{
+  uint32_t
+  s[5U] =
+    {
+      (uint32_t)0x67452301U, (uint32_t)0xefcdab89U, (uint32_t)0x98badcfeU, (uint32_t)0x10325476U,
+      (uint32_t)0xc3d2e1f0U
+    };
+  uint32_t blocks_n0 = input_len / (uint32_t)64U;
+  uint32_t blocks_n1;
+  if (input_len % (uint32_t)64U == (uint32_t)0U && blocks_n0 > (uint32_t)0U)
+  {
+    blocks_n1 = blocks_n0 - (uint32_t)1U;
+  }
+  else
+  {
+    blocks_n1 = blocks_n0;
+  }
+  uint32_t blocks_len0 = blocks_n1 * (uint32_t)64U;
+  uint8_t *blocks0 = input;
+  uint32_t rest_len0 = input_len - blocks_len0;
+  uint8_t *rest0 = input + blocks_len0;
+  uint32_t blocks_n = blocks_n1;
+  uint32_t blocks_len = blocks_len0;
+  uint8_t *blocks = blocks0;
+  uint32_t rest_len = rest_len0;
+  uint8_t *rest = rest0;
+  Hacl_Hash_SHA1_legacy_update_multi(s, blocks, blocks_n);
+  Hacl_Hash_SHA1_legacy_update_last(s, (uint64_t)blocks_len, rest, rest_len);
+  Hacl_Hash_Core_SHA1_legacy_finish(s, dst);
+}
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA1_legacy_create_in(void)
+{
+  uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
+  uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)5U, sizeof (uint32_t));
+  Hacl_Streaming_MD_state_32
+  s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
+  p[0U] = s;
+  Hacl_Hash_Core_SHA1_legacy_init(block_state);
+  return p;
+}
+
+void Hacl_Streaming_SHA1_legacy_init(Hacl_Streaming_MD_state_32 *s)
+{
+  Hacl_Streaming_MD_state_32 scrut = *s;
+  uint8_t *buf = scrut.buf;
+  uint32_t *block_state = scrut.block_state;
+  Hacl_Hash_Core_SHA1_legacy_init(block_state);
+  Hacl_Streaming_MD_state_32
+  tmp = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
+  s[0U] = tmp;
+}
+
+/**
+0 = success, 1 = max length exceeded
+*/
+uint32_t
+Hacl_Streaming_SHA1_legacy_update(Hacl_Streaming_MD_state_32 *p, uint8_t *data, uint32_t len)
+{
+  Hacl_Streaming_MD_state_32 s = *p;
+  uint64_t total_len = s.total_len;
+  if ((uint64_t)len > (uint64_t)2305843009213693951U - total_len)
+  {
+    return (uint32_t)1U;
+  }
+  uint32_t sz;
+  if (total_len % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len > (uint64_t)0U)
+  {
+    sz = (uint32_t)64U;
+  }
+  else
+  {
+    sz = (uint32_t)(total_len % (uint64_t)(uint32_t)64U);
+  }
+  if (len <= (uint32_t)64U - sz)
+  {
+    Hacl_Streaming_MD_state_32 s1 = *p;
+    uint32_t *block_state1 = s1.block_state;
+    uint8_t *buf = s1.buf;
+    uint64_t total_len1 = s1.total_len;
+    uint32_t sz1;
+    if (total_len1 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len1 > (uint64_t)0U)
+    {
+      sz1 = (uint32_t)64U;
+    }
+    else
+    {
+      sz1 = (uint32_t)(total_len1 % (uint64_t)(uint32_t)64U);
+    }
+    uint8_t *buf2 = buf + sz1;
+    memcpy(buf2, data, len * sizeof (uint8_t));
+    uint64_t total_len2 = total_len1 + (uint64_t)len;
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state1,
+          .buf = buf,
+          .total_len = total_len2
+        }
+      );
+  }
+  else if (sz == (uint32_t)0U)
+  {
+    Hacl_Streaming_MD_state_32 s1 = *p;
+    uint32_t *block_state1 = s1.block_state;
+    uint8_t *buf = s1.buf;
+    uint64_t total_len1 = s1.total_len;
+    uint32_t sz1;
+    if (total_len1 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len1 > (uint64_t)0U)
+    {
+      sz1 = (uint32_t)64U;
+    }
+    else
+    {
+      sz1 = (uint32_t)(total_len1 % (uint64_t)(uint32_t)64U);
+    }
+    if (!(sz1 == (uint32_t)0U))
+    {
+      Hacl_Hash_SHA1_legacy_update_multi(block_state1, buf, (uint32_t)1U);
+    }
+    uint32_t ite;
+    if ((uint64_t)len % (uint64_t)(uint32_t)64U == (uint64_t)0U && (uint64_t)len > (uint64_t)0U)
+    {
+      ite = (uint32_t)64U;
+    }
+    else
+    {
+      ite = (uint32_t)((uint64_t)len % (uint64_t)(uint32_t)64U);
+    }
+    uint32_t n_blocks = (len - ite) / (uint32_t)64U;
+    uint32_t data1_len = n_blocks * (uint32_t)64U;
+    uint32_t data2_len = len - data1_len;
+    uint8_t *data1 = data;
+    uint8_t *data2 = data + data1_len;
+    Hacl_Hash_SHA1_legacy_update_multi(block_state1, data1, data1_len / (uint32_t)64U);
+    uint8_t *dst = buf;
+    memcpy(dst, data2, data2_len * sizeof (uint8_t));
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state1,
+          .buf = buf,
+          .total_len = total_len1 + (uint64_t)len
+        }
+      );
+  }
+  else
+  {
+    uint32_t diff = (uint32_t)64U - sz;
+    uint8_t *data1 = data;
+    uint8_t *data2 = data + diff;
+    Hacl_Streaming_MD_state_32 s1 = *p;
+    uint32_t *block_state10 = s1.block_state;
+    uint8_t *buf0 = s1.buf;
+    uint64_t total_len10 = s1.total_len;
+    uint32_t sz10;
+    if (total_len10 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len10 > (uint64_t)0U)
+    {
+      sz10 = (uint32_t)64U;
+    }
+    else
+    {
+      sz10 = (uint32_t)(total_len10 % (uint64_t)(uint32_t)64U);
+    }
+    uint8_t *buf2 = buf0 + sz10;
+    memcpy(buf2, data1, diff * sizeof (uint8_t));
+    uint64_t total_len2 = total_len10 + (uint64_t)diff;
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state10,
+          .buf = buf0,
+          .total_len = total_len2
+        }
+      );
+    Hacl_Streaming_MD_state_32 s10 = *p;
+    uint32_t *block_state1 = s10.block_state;
+    uint8_t *buf = s10.buf;
+    uint64_t total_len1 = s10.total_len;
+    uint32_t sz1;
+    if (total_len1 % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len1 > (uint64_t)0U)
+    {
+      sz1 = (uint32_t)64U;
+    }
+    else
+    {
+      sz1 = (uint32_t)(total_len1 % (uint64_t)(uint32_t)64U);
+    }
+    if (!(sz1 == (uint32_t)0U))
+    {
+      Hacl_Hash_SHA1_legacy_update_multi(block_state1, buf, (uint32_t)1U);
+    }
+    uint32_t ite;
+    if
+    (
+      (uint64_t)(len - diff)
+      % (uint64_t)(uint32_t)64U
+      == (uint64_t)0U
+      && (uint64_t)(len - diff) > (uint64_t)0U
+    )
+    {
+      ite = (uint32_t)64U;
+    }
+    else
+    {
+      ite = (uint32_t)((uint64_t)(len - diff) % (uint64_t)(uint32_t)64U);
+    }
+    uint32_t n_blocks = (len - diff - ite) / (uint32_t)64U;
+    uint32_t data1_len = n_blocks * (uint32_t)64U;
+    uint32_t data2_len = len - diff - data1_len;
+    uint8_t *data11 = data2;
+    uint8_t *data21 = data2 + data1_len;
+    Hacl_Hash_SHA1_legacy_update_multi(block_state1, data11, data1_len / (uint32_t)64U);
+    uint8_t *dst = buf;
+    memcpy(dst, data21, data2_len * sizeof (uint8_t));
+    *p
+    =
+      (
+        (Hacl_Streaming_MD_state_32){
+          .block_state = block_state1,
+          .buf = buf,
+          .total_len = total_len1 + (uint64_t)(len - diff)
+        }
+      );
+  }
+  return (uint32_t)0U;
+}
+
+void Hacl_Streaming_SHA1_legacy_finish(Hacl_Streaming_MD_state_32 *p, uint8_t *dst)
+{
+  Hacl_Streaming_MD_state_32 scrut = *p;
+  uint32_t *block_state = scrut.block_state;
+  uint8_t *buf_ = scrut.buf;
+  uint64_t total_len = scrut.total_len;
+  uint32_t r;
+  if (total_len % (uint64_t)(uint32_t)64U == (uint64_t)0U && total_len > (uint64_t)0U)
+  {
+    r = (uint32_t)64U;
+  }
+  else
+  {
+    r = (uint32_t)(total_len % (uint64_t)(uint32_t)64U);
+  }
+  uint8_t *buf_1 = buf_;
+  uint32_t tmp_block_state[5U] = { 0U };
+  memcpy(tmp_block_state, block_state, (uint32_t)5U * sizeof (uint32_t));
+  uint32_t ite;
+  if (r % (uint32_t)64U == (uint32_t)0U && r > (uint32_t)0U)
+  {
+    ite = (uint32_t)64U;
+  }
+  else
+  {
+    ite = r % (uint32_t)64U;
+  }
+  uint8_t *buf_last = buf_1 + r - ite;
+  uint8_t *buf_multi = buf_1;
+  Hacl_Hash_SHA1_legacy_update_multi(tmp_block_state, buf_multi, (uint32_t)0U);
+  uint64_t prev_len_last = total_len - (uint64_t)r;
+  Hacl_Hash_SHA1_legacy_update_last(tmp_block_state, prev_len_last, buf_last, r);
+  Hacl_Hash_Core_SHA1_legacy_finish(tmp_block_state, dst);
+}
+
+void Hacl_Streaming_SHA1_legacy_free(Hacl_Streaming_MD_state_32 *s)
+{
+  Hacl_Streaming_MD_state_32 scrut = *s;
+  uint8_t *buf = scrut.buf;
+  uint32_t *block_state = scrut.block_state;
+  KRML_HOST_FREE(block_state);
+  KRML_HOST_FREE(buf);
+  KRML_HOST_FREE(s);
+}
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA1_legacy_copy(Hacl_Streaming_MD_state_32 *s0)
+{
+  Hacl_Streaming_MD_state_32 scrut = *s0;
+  uint32_t *block_state0 = scrut.block_state;
+  uint8_t *buf0 = scrut.buf;
+  uint64_t total_len0 = scrut.total_len;
+  uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
+  memcpy(buf, buf0, (uint32_t)64U * sizeof (uint8_t));
+  uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)5U, sizeof (uint32_t));
+  memcpy(block_state, block_state0, (uint32_t)5U * sizeof (uint32_t));
+  Hacl_Streaming_MD_state_32
+  s = { .block_state = block_state, .buf = buf, .total_len = total_len0 };
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
+  p[0U] = s;
+  return p;
+}
+
+void Hacl_Streaming_SHA1_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst)
+{
+  Hacl_Hash_SHA1_legacy_hash(input, input_len, dst);
+}
+
diff --git a/Modules/_hacl/Hacl_Hash_SHA1.h b/Modules/_hacl/Hacl_Hash_SHA1.h
new file mode 100644
index 0000000..5e2ae8e
--- /dev/null
+++ b/Modules/_hacl/Hacl_Hash_SHA1.h
@@ -0,0 +1,65 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#ifndef __Hacl_Hash_SHA1_H
+#define __Hacl_Hash_SHA1_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <string.h>
+#include "krml/types.h"
+#include "krml/lowstar_endianness.h"
+#include "krml/internal/target.h"
+
+#include "Hacl_Streaming_Types.h"
+
+typedef Hacl_Streaming_MD_state_32 Hacl_Streaming_SHA1_state;
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA1_legacy_create_in(void);
+
+void Hacl_Streaming_SHA1_legacy_init(Hacl_Streaming_MD_state_32 *s);
+
+/**
+0 = success, 1 = max length exceeded
+*/
+uint32_t
+Hacl_Streaming_SHA1_legacy_update(Hacl_Streaming_MD_state_32 *p, uint8_t *data, uint32_t len);
+
+void Hacl_Streaming_SHA1_legacy_finish(Hacl_Streaming_MD_state_32 *p, uint8_t *dst);
+
+void Hacl_Streaming_SHA1_legacy_free(Hacl_Streaming_MD_state_32 *s);
+
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA1_legacy_copy(Hacl_Streaming_MD_state_32 *s0);
+
+void Hacl_Streaming_SHA1_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#define __Hacl_Hash_SHA1_H_DEFINED
+#endif
diff --git a/Modules/_hacl/Hacl_Streaming_SHA2.c b/Modules/_hacl/Hacl_Streaming_SHA2.c
index 8169c7a..69c3be8 100644
--- a/Modules/_hacl/Hacl_Streaming_SHA2.c
+++ b/Modules/_hacl/Hacl_Streaming_SHA2.c
@@ -477,17 +477,14 @@ static inline void sha384_finish(uint64_t *st, uint8_t *h)
 Allocate initial state for the SHA2_256 hash. The state is to be freed by
 calling `free_256`.
 */
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256(void)
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA2_create_in_256(void)
 {
   uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
   uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint32_t));
-  Hacl_Streaming_SHA2_state_sha2_224
+  Hacl_Streaming_MD_state_32
   s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
-  Hacl_Streaming_SHA2_state_sha2_224
-  *p =
-    (Hacl_Streaming_SHA2_state_sha2_224 *)KRML_HOST_MALLOC(sizeof (
-        Hacl_Streaming_SHA2_state_sha2_224
-      ));
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
   p[0U] = s;
   sha256_init(block_state);
   return p;
@@ -499,10 +496,9 @@ The state is to be freed by calling `free_256`. Cloning the state this way is
 useful, for instance, if your control-flow diverges and you need to feed
 more (different) data into the hash in each branch.
 */
-Hacl_Streaming_SHA2_state_sha2_224
-*Hacl_Streaming_SHA2_copy_256(Hacl_Streaming_SHA2_state_sha2_224 *s0)
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA2_copy_256(Hacl_Streaming_MD_state_32 *s0)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 scrut = *s0;
+  Hacl_Streaming_MD_state_32 scrut = *s0;
   uint32_t *block_state0 = scrut.block_state;
   uint8_t *buf0 = scrut.buf;
   uint64_t total_len0 = scrut.total_len;
@@ -510,13 +506,10 @@ Hacl_Streaming_SHA2_state_sha2_224
   memcpy(buf, buf0, (uint32_t)64U * sizeof (uint8_t));
   uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint32_t));
   memcpy(block_state, block_state0, (uint32_t)8U * sizeof (uint32_t));
-  Hacl_Streaming_SHA2_state_sha2_224
+  Hacl_Streaming_MD_state_32
   s = { .block_state = block_state, .buf = buf, .total_len = total_len0 };
-  Hacl_Streaming_SHA2_state_sha2_224
-  *p =
-    (Hacl_Streaming_SHA2_state_sha2_224 *)KRML_HOST_MALLOC(sizeof (
-        Hacl_Streaming_SHA2_state_sha2_224
-      ));
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
   p[0U] = s;
   return p;
 }
@@ -524,21 +517,21 @@ Hacl_Streaming_SHA2_state_sha2_224
 /**
 Reset an existing state to the initial hash state with empty data.
 */
-void Hacl_Streaming_SHA2_init_256(Hacl_Streaming_SHA2_state_sha2_224 *s)
+void Hacl_Streaming_SHA2_init_256(Hacl_Streaming_MD_state_32 *s)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 scrut = *s;
+  Hacl_Streaming_MD_state_32 scrut = *s;
   uint8_t *buf = scrut.buf;
   uint32_t *block_state = scrut.block_state;
   sha256_init(block_state);
-  Hacl_Streaming_SHA2_state_sha2_224
+  Hacl_Streaming_MD_state_32
   tmp = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
   s[0U] = tmp;
 }
 
 static inline uint32_t
-update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t len)
+update_224_256(Hacl_Streaming_MD_state_32 *p, uint8_t *data, uint32_t len)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 s = *p;
+  Hacl_Streaming_MD_state_32 s = *p;
   uint64_t total_len = s.total_len;
   if ((uint64_t)len > (uint64_t)2305843009213693951U - total_len)
   {
@@ -555,7 +548,7 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
   }
   if (len <= (uint32_t)64U - sz)
   {
-    Hacl_Streaming_SHA2_state_sha2_224 s1 = *p;
+    Hacl_Streaming_MD_state_32 s1 = *p;
     uint32_t *block_state1 = s1.block_state;
     uint8_t *buf = s1.buf;
     uint64_t total_len1 = s1.total_len;
@@ -574,7 +567,7 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_224){
+        (Hacl_Streaming_MD_state_32){
           .block_state = block_state1,
           .buf = buf,
           .total_len = total_len2
@@ -583,7 +576,7 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
   }
   else if (sz == (uint32_t)0U)
   {
-    Hacl_Streaming_SHA2_state_sha2_224 s1 = *p;
+    Hacl_Streaming_MD_state_32 s1 = *p;
     uint32_t *block_state1 = s1.block_state;
     uint8_t *buf = s1.buf;
     uint64_t total_len1 = s1.total_len;
@@ -620,7 +613,7 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_224){
+        (Hacl_Streaming_MD_state_32){
           .block_state = block_state1,
           .buf = buf,
           .total_len = total_len1 + (uint64_t)len
@@ -632,7 +625,7 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
     uint32_t diff = (uint32_t)64U - sz;
     uint8_t *data1 = data;
     uint8_t *data2 = data + diff;
-    Hacl_Streaming_SHA2_state_sha2_224 s1 = *p;
+    Hacl_Streaming_MD_state_32 s1 = *p;
     uint32_t *block_state10 = s1.block_state;
     uint8_t *buf0 = s1.buf;
     uint64_t total_len10 = s1.total_len;
@@ -651,13 +644,13 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_224){
+        (Hacl_Streaming_MD_state_32){
           .block_state = block_state10,
           .buf = buf0,
           .total_len = total_len2
         }
       );
-    Hacl_Streaming_SHA2_state_sha2_224 s10 = *p;
+    Hacl_Streaming_MD_state_32 s10 = *p;
     uint32_t *block_state1 = s10.block_state;
     uint8_t *buf = s10.buf;
     uint64_t total_len1 = s10.total_len;
@@ -700,7 +693,7 @@ update_224_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_224){
+        (Hacl_Streaming_MD_state_32){
           .block_state = block_state1,
           .buf = buf,
           .total_len = total_len1 + (uint64_t)(len - diff)
@@ -719,7 +712,7 @@ This function is identical to the update function for SHA2_224.
 */
 uint32_t
 Hacl_Streaming_SHA2_update_256(
-  Hacl_Streaming_SHA2_state_sha2_224 *p,
+  Hacl_Streaming_MD_state_32 *p,
   uint8_t *input,
   uint32_t input_len
 )
@@ -733,9 +726,9 @@ valid after a call to `finish_256`, meaning the user may feed more data into
 the hash via `update_256`. (The finish_256 function operates on an internal copy of
 the state and therefore does not invalidate the client-held state `p`.)
 */
-void Hacl_Streaming_SHA2_finish_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *dst)
+void Hacl_Streaming_SHA2_finish_256(Hacl_Streaming_MD_state_32 *p, uint8_t *dst)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 scrut = *p;
+  Hacl_Streaming_MD_state_32 scrut = *p;
   uint32_t *block_state = scrut.block_state;
   uint8_t *buf_ = scrut.buf;
   uint64_t total_len = scrut.total_len;
@@ -773,9 +766,9 @@ Free a state allocated with `create_in_256`.
 
 This function is identical to the free function for SHA2_224.
 */
-void Hacl_Streaming_SHA2_free_256(Hacl_Streaming_SHA2_state_sha2_224 *s)
+void Hacl_Streaming_SHA2_free_256(Hacl_Streaming_MD_state_32 *s)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 scrut = *s;
+  Hacl_Streaming_MD_state_32 scrut = *s;
   uint8_t *buf = scrut.buf;
   uint32_t *block_state = scrut.block_state;
   KRML_HOST_FREE(block_state);
@@ -802,36 +795,33 @@ void Hacl_Streaming_SHA2_sha256(uint8_t *input, uint32_t input_len, uint8_t *dst
   sha256_finish(st, rb);
 }
 
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_224(void)
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA2_create_in_224(void)
 {
   uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)64U, sizeof (uint8_t));
   uint32_t *block_state = (uint32_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint32_t));
-  Hacl_Streaming_SHA2_state_sha2_224
+  Hacl_Streaming_MD_state_32
   s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
-  Hacl_Streaming_SHA2_state_sha2_224
-  *p =
-    (Hacl_Streaming_SHA2_state_sha2_224 *)KRML_HOST_MALLOC(sizeof (
-        Hacl_Streaming_SHA2_state_sha2_224
-      ));
+  Hacl_Streaming_MD_state_32
+  *p = (Hacl_Streaming_MD_state_32 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_32));
   p[0U] = s;
   sha224_init(block_state);
   return p;
 }
 
-void Hacl_Streaming_SHA2_init_224(Hacl_Streaming_SHA2_state_sha2_224 *s)
+void Hacl_Streaming_SHA2_init_224(Hacl_Streaming_MD_state_32 *s)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 scrut = *s;
+  Hacl_Streaming_MD_state_32 scrut = *s;
   uint8_t *buf = scrut.buf;
   uint32_t *block_state = scrut.block_state;
   sha224_init(block_state);
-  Hacl_Streaming_SHA2_state_sha2_224
+  Hacl_Streaming_MD_state_32
   tmp = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
   s[0U] = tmp;
 }
 
 uint32_t
 Hacl_Streaming_SHA2_update_224(
-  Hacl_Streaming_SHA2_state_sha2_224 *p,
+  Hacl_Streaming_MD_state_32 *p,
   uint8_t *input,
   uint32_t input_len
 )
@@ -844,9 +834,9 @@ Write the resulting hash into `dst`, an array of 28 bytes. The state remains
 valid after a call to `finish_224`, meaning the user may feed more data into
 the hash via `update_224`.
 */
-void Hacl_Streaming_SHA2_finish_224(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *dst)
+void Hacl_Streaming_SHA2_finish_224(Hacl_Streaming_MD_state_32 *p, uint8_t *dst)
 {
-  Hacl_Streaming_SHA2_state_sha2_224 scrut = *p;
+  Hacl_Streaming_MD_state_32 scrut = *p;
   uint32_t *block_state = scrut.block_state;
   uint8_t *buf_ = scrut.buf;
   uint64_t total_len = scrut.total_len;
@@ -879,7 +869,7 @@ void Hacl_Streaming_SHA2_finish_224(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8
   sha224_finish(tmp_block_state, dst);
 }
 
-void Hacl_Streaming_SHA2_free_224(Hacl_Streaming_SHA2_state_sha2_224 *p)
+void Hacl_Streaming_SHA2_free_224(Hacl_Streaming_MD_state_32 *p)
 {
   Hacl_Streaming_SHA2_free_256(p);
 }
@@ -903,17 +893,14 @@ void Hacl_Streaming_SHA2_sha224(uint8_t *input, uint32_t input_len, uint8_t *dst
   sha224_finish(st, rb);
 }
 
-Hacl_Streaming_SHA2_state_sha2_384 *Hacl_Streaming_SHA2_create_in_512(void)
+Hacl_Streaming_MD_state_64 *Hacl_Streaming_SHA2_create_in_512(void)
 {
   uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)128U, sizeof (uint8_t));
   uint64_t *block_state = (uint64_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint64_t));
-  Hacl_Streaming_SHA2_state_sha2_384
+  Hacl_Streaming_MD_state_64
   s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
-  Hacl_Streaming_SHA2_state_sha2_384
-  *p =
-    (Hacl_Streaming_SHA2_state_sha2_384 *)KRML_HOST_MALLOC(sizeof (
-        Hacl_Streaming_SHA2_state_sha2_384
-      ));
+  Hacl_Streaming_MD_state_64
+  *p = (Hacl_Streaming_MD_state_64 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_64));
   p[0U] = s;
   Hacl_SHA2_Scalar32_sha512_init(block_state);
   return p;
@@ -925,10 +912,9 @@ The state is to be freed by calling `free_512`. Cloning the state this way is
 useful, for instance, if your control-flow diverges and you need to feed
 more (different) data into the hash in each branch.
 */
-Hacl_Streaming_SHA2_state_sha2_384
-*Hacl_Streaming_SHA2_copy_512(Hacl_Streaming_SHA2_state_sha2_384 *s0)
+Hacl_Streaming_MD_state_64 *Hacl_Streaming_SHA2_copy_512(Hacl_Streaming_MD_state_64 *s0)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 scrut = *s0;
+  Hacl_Streaming_MD_state_64 scrut = *s0;
   uint64_t *block_state0 = scrut.block_state;
   uint8_t *buf0 = scrut.buf;
   uint64_t total_len0 = scrut.total_len;
@@ -936,32 +922,29 @@ Hacl_Streaming_SHA2_state_sha2_384
   memcpy(buf, buf0, (uint32_t)128U * sizeof (uint8_t));
   uint64_t *block_state = (uint64_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint64_t));
   memcpy(block_state, block_state0, (uint32_t)8U * sizeof (uint64_t));
-  Hacl_Streaming_SHA2_state_sha2_384
+  Hacl_Streaming_MD_state_64
   s = { .block_state = block_state, .buf = buf, .total_len = total_len0 };
-  Hacl_Streaming_SHA2_state_sha2_384
-  *p =
-    (Hacl_Streaming_SHA2_state_sha2_384 *)KRML_HOST_MALLOC(sizeof (
-        Hacl_Streaming_SHA2_state_sha2_384
-      ));
+  Hacl_Streaming_MD_state_64
+  *p = (Hacl_Streaming_MD_state_64 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_64));
   p[0U] = s;
   return p;
 }
 
-void Hacl_Streaming_SHA2_init_512(Hacl_Streaming_SHA2_state_sha2_384 *s)
+void Hacl_Streaming_SHA2_init_512(Hacl_Streaming_MD_state_64 *s)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 scrut = *s;
+  Hacl_Streaming_MD_state_64 scrut = *s;
   uint8_t *buf = scrut.buf;
   uint64_t *block_state = scrut.block_state;
   Hacl_SHA2_Scalar32_sha512_init(block_state);
-  Hacl_Streaming_SHA2_state_sha2_384
+  Hacl_Streaming_MD_state_64
   tmp = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
   s[0U] = tmp;
 }
 
 static inline uint32_t
-update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t len)
+update_384_512(Hacl_Streaming_MD_state_64 *p, uint8_t *data, uint32_t len)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 s = *p;
+  Hacl_Streaming_MD_state_64 s = *p;
   uint64_t total_len = s.total_len;
   if ((uint64_t)len > (uint64_t)18446744073709551615U - total_len)
   {
@@ -978,7 +961,7 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
   }
   if (len <= (uint32_t)128U - sz)
   {
-    Hacl_Streaming_SHA2_state_sha2_384 s1 = *p;
+    Hacl_Streaming_MD_state_64 s1 = *p;
     uint64_t *block_state1 = s1.block_state;
     uint8_t *buf = s1.buf;
     uint64_t total_len1 = s1.total_len;
@@ -997,7 +980,7 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_384){
+        (Hacl_Streaming_MD_state_64){
           .block_state = block_state1,
           .buf = buf,
           .total_len = total_len2
@@ -1006,7 +989,7 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
   }
   else if (sz == (uint32_t)0U)
   {
-    Hacl_Streaming_SHA2_state_sha2_384 s1 = *p;
+    Hacl_Streaming_MD_state_64 s1 = *p;
     uint64_t *block_state1 = s1.block_state;
     uint8_t *buf = s1.buf;
     uint64_t total_len1 = s1.total_len;
@@ -1043,7 +1026,7 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_384){
+        (Hacl_Streaming_MD_state_64){
           .block_state = block_state1,
           .buf = buf,
           .total_len = total_len1 + (uint64_t)len
@@ -1055,7 +1038,7 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
     uint32_t diff = (uint32_t)128U - sz;
     uint8_t *data1 = data;
     uint8_t *data2 = data + diff;
-    Hacl_Streaming_SHA2_state_sha2_384 s1 = *p;
+    Hacl_Streaming_MD_state_64 s1 = *p;
     uint64_t *block_state10 = s1.block_state;
     uint8_t *buf0 = s1.buf;
     uint64_t total_len10 = s1.total_len;
@@ -1074,13 +1057,13 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_384){
+        (Hacl_Streaming_MD_state_64){
           .block_state = block_state10,
           .buf = buf0,
           .total_len = total_len2
         }
       );
-    Hacl_Streaming_SHA2_state_sha2_384 s10 = *p;
+    Hacl_Streaming_MD_state_64 s10 = *p;
     uint64_t *block_state1 = s10.block_state;
     uint8_t *buf = s10.buf;
     uint64_t total_len1 = s10.total_len;
@@ -1123,7 +1106,7 @@ update_384_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *data, uint32_t le
     *p
     =
       (
-        (Hacl_Streaming_SHA2_state_sha2_384){
+        (Hacl_Streaming_MD_state_64){
           .block_state = block_state1,
           .buf = buf,
           .total_len = total_len1 + (uint64_t)(len - diff)
@@ -1142,7 +1125,7 @@ This function is identical to the update function for SHA2_384.
 */
 uint32_t
 Hacl_Streaming_SHA2_update_512(
-  Hacl_Streaming_SHA2_state_sha2_384 *p,
+  Hacl_Streaming_MD_state_64 *p,
   uint8_t *input,
   uint32_t input_len
 )
@@ -1156,9 +1139,9 @@ valid after a call to `finish_512`, meaning the user may feed more data into
 the hash via `update_512`. (The finish_512 function operates on an internal copy of
 the state and therefore does not invalidate the client-held state `p`.)
 */
-void Hacl_Streaming_SHA2_finish_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *dst)
+void Hacl_Streaming_SHA2_finish_512(Hacl_Streaming_MD_state_64 *p, uint8_t *dst)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 scrut = *p;
+  Hacl_Streaming_MD_state_64 scrut = *p;
   uint64_t *block_state = scrut.block_state;
   uint8_t *buf_ = scrut.buf;
   uint64_t total_len = scrut.total_len;
@@ -1200,9 +1183,9 @@ Free a state allocated with `create_in_512`.
 
 This function is identical to the free function for SHA2_384.
 */
-void Hacl_Streaming_SHA2_free_512(Hacl_Streaming_SHA2_state_sha2_384 *s)
+void Hacl_Streaming_SHA2_free_512(Hacl_Streaming_MD_state_64 *s)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 scrut = *s;
+  Hacl_Streaming_MD_state_64 scrut = *s;
   uint8_t *buf = scrut.buf;
   uint64_t *block_state = scrut.block_state;
   KRML_HOST_FREE(block_state);
@@ -1229,36 +1212,33 @@ void Hacl_Streaming_SHA2_sha512(uint8_t *input, uint32_t input_len, uint8_t *dst
   sha512_finish(st, rb);
 }
 
-Hacl_Streaming_SHA2_state_sha2_384 *Hacl_Streaming_SHA2_create_in_384(void)
+Hacl_Streaming_MD_state_64 *Hacl_Streaming_SHA2_create_in_384(void)
 {
   uint8_t *buf = (uint8_t *)KRML_HOST_CALLOC((uint32_t)128U, sizeof (uint8_t));
   uint64_t *block_state = (uint64_t *)KRML_HOST_CALLOC((uint32_t)8U, sizeof (uint64_t));
-  Hacl_Streaming_SHA2_state_sha2_384
+  Hacl_Streaming_MD_state_64
   s = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
-  Hacl_Streaming_SHA2_state_sha2_384
-  *p =
-    (Hacl_Streaming_SHA2_state_sha2_384 *)KRML_HOST_MALLOC(sizeof (
-        Hacl_Streaming_SHA2_state_sha2_384
-      ));
+  Hacl_Streaming_MD_state_64
+  *p = (Hacl_Streaming_MD_state_64 *)KRML_HOST_MALLOC(sizeof (Hacl_Streaming_MD_state_64));
   p[0U] = s;
   sha384_init(block_state);
   return p;
 }
 
-void Hacl_Streaming_SHA2_init_384(Hacl_Streaming_SHA2_state_sha2_384 *s)
+void Hacl_Streaming_SHA2_init_384(Hacl_Streaming_MD_state_64 *s)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 scrut = *s;
+  Hacl_Streaming_MD_state_64 scrut = *s;
   uint8_t *buf = scrut.buf;
   uint64_t *block_state = scrut.block_state;
   sha384_init(block_state);
-  Hacl_Streaming_SHA2_state_sha2_384
+  Hacl_Streaming_MD_state_64
   tmp = { .block_state = block_state, .buf = buf, .total_len = (uint64_t)(uint32_t)0U };
   s[0U] = tmp;
 }
 
 uint32_t
 Hacl_Streaming_SHA2_update_384(
-  Hacl_Streaming_SHA2_state_sha2_384 *p,
+  Hacl_Streaming_MD_state_64 *p,
   uint8_t *input,
   uint32_t input_len
 )
@@ -1271,9 +1251,9 @@ Write the resulting hash into `dst`, an array of 48 bytes. The state remains
 valid after a call to `finish_384`, meaning the user may feed more data into
 the hash via `update_384`.
 */
-void Hacl_Streaming_SHA2_finish_384(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *dst)
+void Hacl_Streaming_SHA2_finish_384(Hacl_Streaming_MD_state_64 *p, uint8_t *dst)
 {
-  Hacl_Streaming_SHA2_state_sha2_384 scrut = *p;
+  Hacl_Streaming_MD_state_64 scrut = *p;
   uint64_t *block_state = scrut.block_state;
   uint8_t *buf_ = scrut.buf;
   uint64_t total_len = scrut.total_len;
@@ -1310,7 +1290,7 @@ void Hacl_Streaming_SHA2_finish_384(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8
   sha384_finish(tmp_block_state, dst);
 }
 
-void Hacl_Streaming_SHA2_free_384(Hacl_Streaming_SHA2_state_sha2_384 *p)
+void Hacl_Streaming_SHA2_free_384(Hacl_Streaming_MD_state_64 *p)
 {
   Hacl_Streaming_SHA2_free_512(p);
 }
diff --git a/Modules/_hacl/Hacl_Streaming_SHA2.h b/Modules/_hacl/Hacl_Streaming_SHA2.h
index 2c90585..b58df4c 100644
--- a/Modules/_hacl/Hacl_Streaming_SHA2.h
+++ b/Modules/_hacl/Hacl_Streaming_SHA2.h
@@ -36,33 +36,22 @@ extern "C" {
 #include "krml/lowstar_endianness.h"
 #include "krml/internal/target.h"
 
+#include "Hacl_Streaming_Types.h"
 
 
-typedef struct Hacl_Streaming_SHA2_state_sha2_224_s
-{
-  uint32_t *block_state;
-  uint8_t *buf;
-  uint64_t total_len;
-}
-Hacl_Streaming_SHA2_state_sha2_224;
+typedef Hacl_Streaming_MD_state_32 Hacl_Streaming_SHA2_state_sha2_224;
 
-typedef Hacl_Streaming_SHA2_state_sha2_224 Hacl_Streaming_SHA2_state_sha2_256;
+typedef Hacl_Streaming_MD_state_32 Hacl_Streaming_SHA2_state_sha2_256;
 
-typedef struct Hacl_Streaming_SHA2_state_sha2_384_s
-{
-  uint64_t *block_state;
-  uint8_t *buf;
-  uint64_t total_len;
-}
-Hacl_Streaming_SHA2_state_sha2_384;
+typedef Hacl_Streaming_MD_state_64 Hacl_Streaming_SHA2_state_sha2_384;
 
-typedef Hacl_Streaming_SHA2_state_sha2_384 Hacl_Streaming_SHA2_state_sha2_512;
+typedef Hacl_Streaming_MD_state_64 Hacl_Streaming_SHA2_state_sha2_512;
 
 /**
 Allocate initial state for the SHA2_256 hash. The state is to be freed by
 calling `free_256`.
 */
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_256(void);
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA2_create_in_256(void);
 
 /**
 Copies the state passed as argument into a newly allocated state (deep copy).
@@ -70,13 +59,12 @@ The state is to be freed by calling `free_256`. Cloning the state this way is
 useful, for instance, if your control-flow diverges and you need to feed
 more (different) data into the hash in each branch.
 */
-Hacl_Streaming_SHA2_state_sha2_224
-*Hacl_Streaming_SHA2_copy_256(Hacl_Streaming_SHA2_state_sha2_224 *s0);
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA2_copy_256(Hacl_Streaming_MD_state_32 *s0);
 
 /**
 Reset an existing state to the initial hash state with empty data.
 */
-void Hacl_Streaming_SHA2_init_256(Hacl_Streaming_SHA2_state_sha2_224 *s);
+void Hacl_Streaming_SHA2_init_256(Hacl_Streaming_MD_state_32 *s);
 
 /**
 Feed an arbitrary amount of data into the hash. This function returns 0 for
@@ -87,7 +75,7 @@ This function is identical to the update function for SHA2_224.
 */
 uint32_t
 Hacl_Streaming_SHA2_update_256(
-  Hacl_Streaming_SHA2_state_sha2_224 *p,
+  Hacl_Streaming_MD_state_32 *p,
   uint8_t *input,
   uint32_t input_len
 );
@@ -98,27 +86,27 @@ valid after a call to `finish_256`, meaning the user may feed more data into
 the hash via `update_256`. (The finish_256 function operates on an internal copy of
 the state and therefore does not invalidate the client-held state `p`.)
 */
-void Hacl_Streaming_SHA2_finish_256(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *dst);
+void Hacl_Streaming_SHA2_finish_256(Hacl_Streaming_MD_state_32 *p, uint8_t *dst);
 
 /**
 Free a state allocated with `create_in_256`.
 
 This function is identical to the free function for SHA2_224.
 */
-void Hacl_Streaming_SHA2_free_256(Hacl_Streaming_SHA2_state_sha2_224 *s);
+void Hacl_Streaming_SHA2_free_256(Hacl_Streaming_MD_state_32 *s);
 
 /**
 Hash `input`, of len `input_len`, into `dst`, an array of 32 bytes.
 */
 void Hacl_Streaming_SHA2_sha256(uint8_t *input, uint32_t input_len, uint8_t *dst);
 
-Hacl_Streaming_SHA2_state_sha2_224 *Hacl_Streaming_SHA2_create_in_224(void);
+Hacl_Streaming_MD_state_32 *Hacl_Streaming_SHA2_create_in_224(void);
 
-void Hacl_Streaming_SHA2_init_224(Hacl_Streaming_SHA2_state_sha2_224 *s);
+void Hacl_Streaming_SHA2_init_224(Hacl_Streaming_MD_state_32 *s);
 
 uint32_t
 Hacl_Streaming_SHA2_update_224(
-  Hacl_Streaming_SHA2_state_sha2_224 *p,
+  Hacl_Streaming_MD_state_32 *p,
   uint8_t *input,
   uint32_t input_len
 );
@@ -128,16 +116,16 @@ Write the resulting hash into `dst`, an array of 28 bytes. The state remains
 valid after a call to `finish_224`, meaning the user may feed more data into
 the hash via `update_224`.
 */
-void Hacl_Streaming_SHA2_finish_224(Hacl_Streaming_SHA2_state_sha2_224 *p, uint8_t *dst);
+void Hacl_Streaming_SHA2_finish_224(Hacl_Streaming_MD_state_32 *p, uint8_t *dst);
 
-void Hacl_Streaming_SHA2_free_224(Hacl_Streaming_SHA2_state_sha2_224 *p);
+void Hacl_Streaming_SHA2_free_224(Hacl_Streaming_MD_state_32 *p);
 
 /**
 Hash `input`, of len `input_len`, into `dst`, an array of 28 bytes.
 */
 void Hacl_Streaming_SHA2_sha224(uint8_t *input, uint32_t input_len, uint8_t *dst);
 
-Hacl_Streaming_SHA2_state_sha2_384 *Hacl_Streaming_SHA2_create_in_512(void);
+Hacl_Streaming_MD_state_64 *Hacl_Streaming_SHA2_create_in_512(void);
 
 /**
 Copies the state passed as argument into a newly allocated state (deep copy).
@@ -145,10 +133,9 @@ The state is to be freed by calling `free_512`. Cloning the state this way is
 useful, for instance, if your control-flow diverges and you need to feed
 more (different) data into the hash in each branch.
 */
-Hacl_Streaming_SHA2_state_sha2_384
-*Hacl_Streaming_SHA2_copy_512(Hacl_Streaming_SHA2_state_sha2_384 *s0);
+Hacl_Streaming_MD_state_64 *Hacl_Streaming_SHA2_copy_512(Hacl_Streaming_MD_state_64 *s0);
 
-void Hacl_Streaming_SHA2_init_512(Hacl_Streaming_SHA2_state_sha2_384 *s);
+void Hacl_Streaming_SHA2_init_512(Hacl_Streaming_MD_state_64 *s);
 
 /**
 Feed an arbitrary amount of data into the hash. This function returns 0 for
@@ -159,7 +146,7 @@ This function is identical to the update function for SHA2_384.
 */
 uint32_t
 Hacl_Streaming_SHA2_update_512(
-  Hacl_Streaming_SHA2_state_sha2_384 *p,
+  Hacl_Streaming_MD_state_64 *p,
   uint8_t *input,
   uint32_t input_len
 );
@@ -170,27 +157,27 @@ valid after a call to `finish_512`, meaning the user may feed more data into
 the hash via `update_512`. (The finish_512 function operates on an internal copy of
 the state and therefore does not invalidate the client-held state `p`.)
 */
-void Hacl_Streaming_SHA2_finish_512(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *dst);
+void Hacl_Streaming_SHA2_finish_512(Hacl_Streaming_MD_state_64 *p, uint8_t *dst);
 
 /**
 Free a state allocated with `create_in_512`.
 
 This function is identical to the free function for SHA2_384.
 */
-void Hacl_Streaming_SHA2_free_512(Hacl_Streaming_SHA2_state_sha2_384 *s);
+void Hacl_Streaming_SHA2_free_512(Hacl_Streaming_MD_state_64 *s);
 
 /**
 Hash `input`, of len `input_len`, into `dst`, an array of 64 bytes.
 */
 void Hacl_Streaming_SHA2_sha512(uint8_t *input, uint32_t input_len, uint8_t *dst);
 
-Hacl_Streaming_SHA2_state_sha2_384 *Hacl_Streaming_SHA2_create_in_384(void);
+Hacl_Streaming_MD_state_64 *Hacl_Streaming_SHA2_create_in_384(void);
 
-void Hacl_Streaming_SHA2_init_384(Hacl_Streaming_SHA2_state_sha2_384 *s);
+void Hacl_Streaming_SHA2_init_384(Hacl_Streaming_MD_state_64 *s);
 
 uint32_t
 Hacl_Streaming_SHA2_update_384(
-  Hacl_Streaming_SHA2_state_sha2_384 *p,
+  Hacl_Streaming_MD_state_64 *p,
   uint8_t *input,
   uint32_t input_len
 );
@@ -200,9 +187,9 @@ Write the resulting hash into `dst`, an array of 48 bytes. The state remains
 valid after a call to `finish_384`, meaning the user may feed more data into
 the hash via `update_384`.
 */
-void Hacl_Streaming_SHA2_finish_384(Hacl_Streaming_SHA2_state_sha2_384 *p, uint8_t *dst);
+void Hacl_Streaming_SHA2_finish_384(Hacl_Streaming_MD_state_64 *p, uint8_t *dst);
 
-void Hacl_Streaming_SHA2_free_384(Hacl_Streaming_SHA2_state_sha2_384 *p);
+void Hacl_Streaming_SHA2_free_384(Hacl_Streaming_MD_state_64 *p);
 
 /**
 Hash `input`, of len `input_len`, into `dst`, an array of 48 bytes.
diff --git a/Modules/_hacl/Hacl_Streaming_Types.h b/Modules/_hacl/Hacl_Streaming_Types.h
new file mode 100644
index 0000000..5105761
--- /dev/null
+++ b/Modules/_hacl/Hacl_Streaming_Types.h
@@ -0,0 +1,59 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#ifndef __Hacl_Streaming_Types_H
+#define __Hacl_Streaming_Types_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <string.h>
+#include "krml/types.h"
+#include "krml/lowstar_endianness.h"
+#include "krml/internal/target.h"
+
+typedef struct Hacl_Streaming_MD_state_32_s
+{
+  uint32_t *block_state;
+  uint8_t *buf;
+  uint64_t total_len;
+}
+Hacl_Streaming_MD_state_32;
+
+typedef struct Hacl_Streaming_MD_state_64_s
+{
+  uint64_t *block_state;
+  uint8_t *buf;
+  uint64_t total_len;
+}
+Hacl_Streaming_MD_state_64;
+
+#if defined(__cplusplus)
+}
+#endif
+
+#define __Hacl_Streaming_Types_H_DEFINED
+#endif
diff --git a/Modules/_hacl/include/krml/FStar_UInt128_Verified.h b/Modules/_hacl/include/krml/FStar_UInt128_Verified.h
index ee16019..3d36d44 100644
--- a/Modules/_hacl/include/krml/FStar_UInt128_Verified.h
+++ b/Modules/_hacl/include/krml/FStar_UInt128_Verified.h
@@ -7,13 +7,12 @@
 #ifndef __FStar_UInt128_Verified_H
 #define __FStar_UInt128_Verified_H
 
-
-
 #include "FStar_UInt_8_16_32_64.h"
 #include <inttypes.h>
 #include <stdbool.h>
 #include "krml/types.h"
 #include "krml/internal/target.h"
+
 static inline uint64_t FStar_UInt128_constant_time_carry(uint64_t a, uint64_t b)
 {
   return (a ^ ((a ^ b) | ((a - b) ^ b))) >> (uint32_t)63U;
diff --git a/Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h b/Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h
index 965afc8..a56c7d6 100644
--- a/Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h
+++ b/Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h
@@ -7,15 +7,13 @@
 #ifndef __FStar_UInt_8_16_32_64_H
 #define __FStar_UInt_8_16_32_64_H
 
-
-
-
 #include <inttypes.h>
 #include <stdbool.h>
 
 #include "krml/lowstar_endianness.h"
 #include "krml/types.h"
 #include "krml/internal/target.h"
+
 static inline uint64_t FStar_UInt64_eq_mask(uint64_t a, uint64_t b)
 {
   uint64_t x = a ^ b;
diff --git a/Modules/_hacl/include/krml/internal/target.h b/Modules/_hacl/include/krml/internal/target.h
index 9ef5985..dcbe700 100644
--- a/Modules/_hacl/include/krml/internal/target.h
+++ b/Modules/_hacl/include/krml/internal/target.h
@@ -31,6 +31,10 @@
 #  define KRML_HOST_FREE free
 #endif
 
+#ifndef KRML_HOST_IGNORE
+#  define KRML_HOST_IGNORE(x) (void)(x)
+#endif
+
 /* Macros for prettier unrolling of loops */
 #define KRML_LOOP1(i, n, x) { \
   x \
diff --git a/Modules/_hacl/internal/Hacl_Hash_MD5.h b/Modules/_hacl/internal/Hacl_Hash_MD5.h
new file mode 100644
index 0000000..87ad4cf
--- /dev/null
+++ b/Modules/_hacl/internal/Hacl_Hash_MD5.h
@@ -0,0 +1,61 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#ifndef __internal_Hacl_Hash_MD5_H
+#define __internal_Hacl_Hash_MD5_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <string.h>
+#include "krml/types.h"
+#include "krml/lowstar_endianness.h"
+#include "krml/internal/target.h"
+
+#include "../Hacl_Hash_MD5.h"
+
+void Hacl_Hash_Core_MD5_legacy_init(uint32_t *s);
+
+void Hacl_Hash_Core_MD5_legacy_finish(uint32_t *s, uint8_t *dst);
+
+void Hacl_Hash_MD5_legacy_update_multi(uint32_t *s, uint8_t *blocks, uint32_t n_blocks);
+
+void
+Hacl_Hash_MD5_legacy_update_last(
+  uint32_t *s,
+  uint64_t prev_len,
+  uint8_t *input,
+  uint32_t input_len
+);
+
+void Hacl_Hash_MD5_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#define __internal_Hacl_Hash_MD5_H_DEFINED
+#endif
diff --git a/Modules/_hacl/internal/Hacl_Hash_SHA1.h b/Modules/_hacl/internal/Hacl_Hash_SHA1.h
new file mode 100644
index 0000000..d2d9df4
--- /dev/null
+++ b/Modules/_hacl/internal/Hacl_Hash_SHA1.h
@@ -0,0 +1,61 @@
+/* MIT License
+ *
+ * Copyright (c) 2016-2022 INRIA, CMU and Microsoft Corporation
+ * Copyright (c) 2022-2023 HACL* Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+#ifndef __internal_Hacl_Hash_SHA1_H
+#define __internal_Hacl_Hash_SHA1_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <string.h>
+#include "krml/types.h"
+#include "krml/lowstar_endianness.h"
+#include "krml/internal/target.h"
+
+#include "../Hacl_Hash_SHA1.h"
+
+void Hacl_Hash_Core_SHA1_legacy_init(uint32_t *s);
+
+void Hacl_Hash_Core_SHA1_legacy_finish(uint32_t *s, uint8_t *dst);
+
+void Hacl_Hash_SHA1_legacy_update_multi(uint32_t *s, uint8_t *blocks, uint32_t n_blocks);
+
+void
+Hacl_Hash_SHA1_legacy_update_last(
+  uint32_t *s,
+  uint64_t prev_len,
+  uint8_t *input,
+  uint32_t input_len
+);
+
+void Hacl_Hash_SHA1_legacy_hash(uint8_t *input, uint32_t input_len, uint8_t *dst);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#define __internal_Hacl_Hash_SHA1_H_DEFINED
+#endif
diff --git a/Modules/_hacl/python_hacl_namespaces.h b/Modules/_hacl/python_hacl_namespaces.h
index ac12f38..ee28f24 100644
--- a/Modules/_hacl/python_hacl_namespaces.h
+++ b/Modules/_hacl/python_hacl_namespaces.h
@@ -43,4 +43,21 @@
 #define Hacl_Streaming_SHA2_sha512 python_hashlib_Hacl_Streaming_SHA2_sha512
 #define Hacl_Streaming_SHA2_sha384 python_hashlib_Hacl_Streaming_SHA2_sha384
 
+#define Hacl_Streaming_MD5_legacy_create_in python_hashlib_Hacl_Streaming_MD5_legacy_create_in
+#define Hacl_Streaming_MD5_legacy_init python_hashlib_Hacl_Streaming_MD5_legacy_init
+#define Hacl_Streaming_MD5_legacy_update python_hashlib_Hacl_Streaming_MD5_legacy_update
+#define Hacl_Streaming_MD5_legacy_finish python_hashlib_Hacl_Streaming_MD5_legacy_finish
+#define Hacl_Streaming_MD5_legacy_free python_hashlib_Hacl_Streaming_MD5_legacy_free
+#define Hacl_Streaming_MD5_legacy_copy python_hashlib_Hacl_Streaming_MD5_legacy_copy
+#define Hacl_Streaming_MD5_legacy_hash python_hashlib_Hacl_Streaming_MD5_legacy_hash
+
+#define Hacl_Streaming_SHA1_legacy_create_in python_hashlib_Hacl_Streaming_SHA1_legacy_create_in
+#define Hacl_Streaming_SHA1_legacy_init python_hashlib_Hacl_Streaming_SHA1_legacy_init
+#define Hacl_Streaming_SHA1_legacy_update python_hashlib_Hacl_Streaming_SHA1_legacy_update
+#define Hacl_Streaming_SHA1_legacy_finish python_hashlib_Hacl_Streaming_SHA1_legacy_finish
+#define Hacl_Streaming_SHA1_legacy_free python_hashlib_Hacl_Streaming_SHA1_legacy_free
+#define Hacl_Streaming_SHA1_legacy_copy python_hashlib_Hacl_Streaming_SHA1_legacy_copy
+#define Hacl_Streaming_SHA1_legacy_hash python_hashlib_Hacl_Streaming_SHA1_legacy_hash
+
+
 #endif  // _PYTHON_HACL_NAMESPACES_H
diff --git a/Modules/_hacl/refresh.sh b/Modules/_hacl/refresh.sh
index dba8cb3..76b92ec 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=4751fc2b11639f651718abf8522fcc36902ca67c
+expected_hacl_star_rev=13e0c6721ac9206c4249ecc1dc04ed617ad1e262
 
 hacl_dir="$(realpath "$1")"
 cd "$(dirname "$0")"
@@ -41,8 +41,15 @@ fi
 declare -a dist_files
 dist_files=(
   Hacl_Streaming_SHA2.h
+  Hacl_Streaming_Types.h
+  Hacl_Hash_SHA1.h
+  internal/Hacl_Hash_SHA1.h
+  Hacl_Hash_MD5.h
+  internal/Hacl_Hash_MD5.h
   internal/Hacl_SHA2_Generic.h
   Hacl_Streaming_SHA2.c
+  Hacl_Hash_SHA1.c
+  Hacl_Hash_MD5.c
 )
 
 declare -a include_files
diff --git a/Modules/md5module.c b/Modules/md5module.c
index 48b11e0..df3d6a4 100644
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -43,283 +43,17 @@ typedef long long MD5_INT64; /* 64-bit integer */
 #define MD5_BLOCKSIZE    64
 #define MD5_DIGESTSIZE   16
 
-/* The structure for storing MD5 info */
+#include "_hacl/Hacl_Hash_MD5.h"
 
-struct md5_state {
-    MD5_INT64 length;
-    MD5_INT32 state[4], curlen;
-    unsigned char buf[MD5_BLOCKSIZE];
-};
 
 typedef struct {
     PyObject_HEAD
 
-    struct md5_state hash_state;
+    Hacl_Streaming_MD5_state *hash_state;
 } MD5object;
 
 #include "clinic/md5module.c.h"
 
-/* ------------------------------------------------------------------------
- *
- * This code for the MD5 algorithm was noted as public domain. The
- * original headers are pasted below.
- *
- * Several changes have been made to make it more compatible with the
- * Python environment and desired interface.
- *
- */
-
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, https://www.libtom.net
- */
-
-/* rotate the hard way (platform optimizations could be done) */
-#define ROLc(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-
-/* Endian Neutral macros that work on all platforms */
-
-#define STORE32L(x, y)                                                                     \
-     { (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);   \
-       (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-#define LOAD32L(x, y)                            \
-     { x = ((unsigned long)((y)[3] & 255)<<24) | \
-           ((unsigned long)((y)[2] & 255)<<16) | \
-           ((unsigned long)((y)[1] & 255)<<8)  | \
-           ((unsigned long)((y)[0] & 255)); }
-
-#define STORE64L(x, y)                                                                     \
-     { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255);   \
-       (y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255);   \
-       (y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255);   \
-       (y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); }
-
-
-/* MD5 macros */
-
-#define F(x,y,z)  (z ^ (x & (y ^ z)))
-#define G(x,y,z)  (y ^ (z & (y ^ x)))
-#define H(x,y,z)  (x^y^z)
-#define I(x,y,z)  (y^(x|(~z)))
-
-#define FF(a,b,c,d,M,s,t) \
-    a = (a + F(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-#define GG(a,b,c,d,M,s,t) \
-    a = (a + G(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-#define HH(a,b,c,d,M,s,t) \
-    a = (a + H(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-#define II(a,b,c,d,M,s,t) \
-    a = (a + I(b,c,d) + M + t); a = ROLc(a, s) + b;
-
-
-static void md5_compress(struct md5_state *md5, const unsigned char *buf)
-{
-    MD5_INT32 i, W[16], a, b, c, d;
-
-    assert(md5 != NULL);
-    assert(buf != NULL);
-
-    /* copy the state into 512-bits into W[0..15] */
-    for (i = 0; i < 16; i++) {
-        LOAD32L(W[i], buf + (4*i));
-    }
-
-    /* copy state */
-    a = md5->state[0];
-    b = md5->state[1];
-    c = md5->state[2];
-    d = md5->state[3];
-
-    FF(a,b,c,d,W[0],7,0xd76aa478UL)
-    FF(d,a,b,c,W[1],12,0xe8c7b756UL)
-    FF(c,d,a,b,W[2],17,0x242070dbUL)
-    FF(b,c,d,a,W[3],22,0xc1bdceeeUL)
-    FF(a,b,c,d,W[4],7,0xf57c0fafUL)
-    FF(d,a,b,c,W[5],12,0x4787c62aUL)
-    FF(c,d,a,b,W[6],17,0xa8304613UL)
-    FF(b,c,d,a,W[7],22,0xfd469501UL)
-    FF(a,b,c,d,W[8],7,0x698098d8UL)
-    FF(d,a,b,c,W[9],12,0x8b44f7afUL)
-    FF(c,d,a,b,W[10],17,0xffff5bb1UL)
-    FF(b,c,d,a,W[11],22,0x895cd7beUL)
-    FF(a,b,c,d,W[12],7,0x6b901122UL)
-    FF(d,a,b,c,W[13],12,0xfd987193UL)
-    FF(c,d,a,b,W[14],17,0xa679438eUL)
-    FF(b,c,d,a,W[15],22,0x49b40821UL)
-    GG(a,b,c,d,W[1],5,0xf61e2562UL)
-    GG(d,a,b,c,W[6],9,0xc040b340UL)
-    GG(c,d,a,b,W[11],14,0x265e5a51UL)
-    GG(b,c,d,a,W[0],20,0xe9b6c7aaUL)
-    GG(a,b,c,d,W[5],5,0xd62f105dUL)
-    GG(d,a,b,c,W[10],9,0x02441453UL)
-    GG(c,d,a,b,W[15],14,0xd8a1e681UL)
-    GG(b,c,d,a,W[4],20,0xe7d3fbc8UL)
-    GG(a,b,c,d,W[9],5,0x21e1cde6UL)
-    GG(d,a,b,c,W[14],9,0xc33707d6UL)
-    GG(c,d,a,b,W[3],14,0xf4d50d87UL)
-    GG(b,c,d,a,W[8],20,0x455a14edUL)
-    GG(a,b,c,d,W[13],5,0xa9e3e905UL)
-    GG(d,a,b,c,W[2],9,0xfcefa3f8UL)
-    GG(c,d,a,b,W[7],14,0x676f02d9UL)
-    GG(b,c,d,a,W[12],20,0x8d2a4c8aUL)
-    HH(a,b,c,d,W[5],4,0xfffa3942UL)
-    HH(d,a,b,c,W[8],11,0x8771f681UL)
-    HH(c,d,a,b,W[11],16,0x6d9d6122UL)
-    HH(b,c,d,a,W[14],23,0xfde5380cUL)
-    HH(a,b,c,d,W[1],4,0xa4beea44UL)
-    HH(d,a,b,c,W[4],11,0x4bdecfa9UL)
-    HH(c,d,a,b,W[7],16,0xf6bb4b60UL)
-    HH(b,c,d,a,W[10],23,0xbebfbc70UL)
-    HH(a,b,c,d,W[13],4,0x289b7ec6UL)
-    HH(d,a,b,c,W[0],11,0xeaa127faUL)
-    HH(c,d,a,b,W[3],16,0xd4ef3085UL)
-    HH(b,c,d,a,W[6],23,0x04881d05UL)
-    HH(a,b,c,d,W[9],4,0xd9d4d039UL)
-    HH(d,a,b,c,W[12],11,0xe6db99e5UL)
-    HH(c,d,a,b,W[15],16,0x1fa27cf8UL)
-    HH(b,c,d,a,W[2],23,0xc4ac5665UL)
-    II(a,b,c,d,W[0],6,0xf4292244UL)
-    II(d,a,b,c,W[7],10,0x432aff97UL)
-    II(c,d,a,b,W[14],15,0xab9423a7UL)
-    II(b,c,d,a,W[5],21,0xfc93a039UL)
-    II(a,b,c,d,W[12],6,0x655b59c3UL)
-    II(d,a,b,c,W[3],10,0x8f0ccc92UL)
-    II(c,d,a,b,W[10],15,0xffeff47dUL)
-    II(b,c,d,a,W[1],21,0x85845dd1UL)
-    II(a,b,c,d,W[8],6,0x6fa87e4fUL)
-    II(d,a,b,c,W[15],10,0xfe2ce6e0UL)
-    II(c,d,a,b,W[6],15,0xa3014314UL)
-    II(b,c,d,a,W[13],21,0x4e0811a1UL)
-    II(a,b,c,d,W[4],6,0xf7537e82UL)
-    II(d,a,b,c,W[11],10,0xbd3af235UL)
-    II(c,d,a,b,W[2],15,0x2ad7d2bbUL)
-    II(b,c,d,a,W[9],21,0xeb86d391UL)
-
-    md5->state[0] = md5->state[0] + a;
-    md5->state[1] = md5->state[1] + b;
-    md5->state[2] = md5->state[2] + c;
-    md5->state[3] = md5->state[3] + d;
-}
-
-
-/**
-   Initialize the hash state
-   @param md5   The hash state you wish to initialize
-*/
-static void
-md5_init(struct md5_state *md5)
-{
-    assert(md5 != NULL);
-    md5->state[0] = 0x67452301UL;
-    md5->state[1] = 0xefcdab89UL;
-    md5->state[2] = 0x98badcfeUL;
-    md5->state[3] = 0x10325476UL;
-    md5->curlen = 0;
-    md5->length = 0;
-}
-
-/**
-   Process a block of memory though the hash
-   @param md5   The hash state
-   @param in     The data to hash
-   @param inlen  The length of the data (octets)
-*/
-static void
-md5_process(struct md5_state *md5, const unsigned char *in, Py_ssize_t inlen)
-{
-    Py_ssize_t n;
-
-    assert(md5 != NULL);
-    assert(in != NULL);
-    assert(md5->curlen <= sizeof(md5->buf));
-
-    while (inlen > 0) {
-        if (md5->curlen == 0 && inlen >= MD5_BLOCKSIZE) {
-           md5_compress(md5, in);
-           md5->length    += MD5_BLOCKSIZE * 8;
-           in             += MD5_BLOCKSIZE;
-           inlen          -= MD5_BLOCKSIZE;
-        } else {
-           n = Py_MIN(inlen, (Py_ssize_t)(MD5_BLOCKSIZE - md5->curlen));
-           memcpy(md5->buf + md5->curlen, in, (size_t)n);
-           md5->curlen    += (MD5_INT32)n;
-           in             += n;
-           inlen          -= n;
-           if (md5->curlen == MD5_BLOCKSIZE) {
-              md5_compress(md5, md5->buf);
-              md5->length += 8*MD5_BLOCKSIZE;
-              md5->curlen = 0;
-           }
-       }
-    }
-}
-
-/**
-   Terminate the hash to get the digest
-   @param md5  The hash state
-   @param out [out] The destination of the hash (16 bytes)
-*/
-static void
-md5_done(struct md5_state *md5, unsigned char *out)
-{
-    int i;
-
-    assert(md5 != NULL);
-    assert(out != NULL);
-    assert(md5->curlen < sizeof(md5->buf));
-
-    /* increase the length of the message */
-    md5->length += md5->curlen * 8;
-
-    /* append the '1' bit */
-    md5->buf[md5->curlen++] = (unsigned char)0x80;
-
-    /* if the length is currently above 56 bytes we append zeros
-     * then compress.  Then we can fall back to padding zeros and length
-     * encoding like normal.
-     */
-    if (md5->curlen > 56) {
-        while (md5->curlen < 64) {
-            md5->buf[md5->curlen++] = (unsigned char)0;
-        }
-        md5_compress(md5, md5->buf);
-        md5->curlen = 0;
-    }
-
-    /* pad up to 56 bytes of zeroes */
-    while (md5->curlen < 56) {
-        md5->buf[md5->curlen++] = (unsigned char)0;
-    }
-
-    /* store length */
-    STORE64L(md5->length, md5->buf+56);
-    md5_compress(md5, md5->buf);
-
-    /* copy output */
-    for (i = 0; i < 4; i++) {
-        STORE32L(md5->state[i], out+(4*i));
-    }
-}
-
-/* .Source: /cvs/libtom/libtomcrypt/src/hashes/md5.c,v $ */
-/* .Revision: 1.10 $ */
-/* .Date: 2007/05/12 14:25:28 $ */
-
-/*
- * End of copied MD5 code.
- *
- * ------------------------------------------------------------------------
- */
 
 typedef struct {
     PyTypeObject* md5_type;
@@ -350,8 +84,9 @@ MD5_traverse(PyObject *ptr, visitproc visit, void *arg)
 }
 
 static void
-MD5_dealloc(PyObject *ptr)
+MD5_dealloc(MD5object *ptr)
 {
+    Hacl_Streaming_MD5_legacy_free(ptr->hash_state);
     PyTypeObject *tp = Py_TYPE(ptr);
     PyObject_GC_UnTrack(ptr);
     PyObject_GC_Del(ptr);
@@ -379,7 +114,7 @@ MD5Type_copy_impl(MD5object *self, PyTypeObject *cls)
     if ((newobj = newMD5object(st))==NULL)
         return NULL;
 
-    newobj->hash_state = self->hash_state;
+    newobj->hash_state = Hacl_Streaming_MD5_legacy_copy(self->hash_state);
     return (PyObject *)newobj;
 }
 
@@ -394,10 +129,7 @@ MD5Type_digest_impl(MD5object *self)
 /*[clinic end generated code: output=eb691dc4190a07ec input=bc0c4397c2994be6]*/
 {
     unsigned char digest[MD5_DIGESTSIZE];
-    struct md5_state temp;
-
-    temp = self->hash_state;
-    md5_done(&temp, digest);
+    Hacl_Streaming_MD5_legacy_finish(self->hash_state, digest);
     return PyBytes_FromStringAndSize((const char *)digest, MD5_DIGESTSIZE);
 }
 
@@ -412,15 +144,21 @@ MD5Type_hexdigest_impl(MD5object *self)
 /*[clinic end generated code: output=17badced1f3ac932 input=b60b19de644798dd]*/
 {
     unsigned char digest[MD5_DIGESTSIZE];
-    struct md5_state temp;
-
-    /* Get the raw (binary) digest value */
-    temp = self->hash_state;
-    md5_done(&temp, digest);
-
+    Hacl_Streaming_MD5_legacy_finish(self->hash_state, digest);
     return _Py_strhex((const char*)digest, MD5_DIGESTSIZE);
 }
 
+static void update(Hacl_Streaming_MD5_state *state, uint8_t *buf, Py_ssize_t len) {
+#if PY_SSIZE_T_MAX > UINT32_MAX
+  while (len > UINT32_MAX) {
+    Hacl_Streaming_MD5_legacy_update(state, buf, UINT32_MAX);
+    len -= UINT32_MAX;
+    buf += UINT32_MAX;
+  }
+#endif
+  Hacl_Streaming_MD5_legacy_update(state, buf, (uint32_t) len);
+}
+
 /*[clinic input]
 MD5Type.update
 
@@ -438,7 +176,7 @@ MD5Type_update(MD5object *self, PyObject *obj)
 
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
 
-    md5_process(&self->hash_state, buf.buf, buf.len);
+    update(self->hash_state, buf.buf, buf.len);
 
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
@@ -531,7 +269,7 @@ _md5_md5_impl(PyObject *module, PyObject *string, int usedforsecurity)
         return NULL;
     }
 
-    md5_init(&new->hash_state);
+    new->hash_state = Hacl_Streaming_MD5_legacy_create_in();
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
@@ -540,7 +278,7 @@ _md5_md5_impl(PyObject *module, PyObject *string, int usedforsecurity)
         return NULL;
     }
     if (string) {
-        md5_process(&new->hash_state, buf.buf, buf.len);
+        update(new->hash_state, buf.buf, buf.len);
         PyBuffer_Release(&buf);
     }
 
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
index 9153557..0f50d53 100644
--- a/Modules/sha1module.c
+++ b/Modules/sha1module.c
@@ -43,260 +43,16 @@ typedef long long SHA1_INT64;        /* 64-bit integer */
 #define SHA1_BLOCKSIZE    64
 #define SHA1_DIGESTSIZE   20
 
-/* The structure for storing SHA1 info */
-
-struct sha1_state {
-    SHA1_INT64 length;
-    SHA1_INT32 state[5], curlen;
-    unsigned char buf[SHA1_BLOCKSIZE];
-};
+#include "_hacl/Hacl_Hash_SHA1.h"
 
 typedef struct {
     PyObject_HEAD
 
-    struct sha1_state hash_state;
+    Hacl_Streaming_SHA1_state *hash_state;
 } SHA1object;
 
 #include "clinic/sha1module.c.h"
 
-/* ------------------------------------------------------------------------
- *
- * This code for the SHA1 algorithm was noted as public domain. The
- * original headers are pasted below.
- *
- * Several changes have been made to make it more compatible with the
- * Python environment and desired interface.
- *
- */
-
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, https://www.libtom.net
- */
-
-/* rotate the hard way (platform optimizations could be done) */
-#define ROL(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-#define ROLc(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
-
-/* Endian Neutral macros that work on all platforms */
-
-#define STORE32H(x, y)                                                                     \
-     { (y)[0] = (unsigned char)(((x)>>24)&255); (y)[1] = (unsigned char)(((x)>>16)&255);   \
-       (y)[2] = (unsigned char)(((x)>>8)&255); (y)[3] = (unsigned char)((x)&255); }
-
-#define LOAD32H(x, y)                            \
-     { x = ((unsigned long)((y)[0] & 255)<<24) | \
-           ((unsigned long)((y)[1] & 255)<<16) | \
-           ((unsigned long)((y)[2] & 255)<<8)  | \
-           ((unsigned long)((y)[3] & 255)); }
-
-#define STORE64H(x, y)                                                                     \
-   { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255);     \
-     (y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255);     \
-     (y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255);     \
-     (y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); }
-
-
-/* SHA1 macros */
-
-#define F0(x,y,z)  (z ^ (x & (y ^ z)))
-#define F1(x,y,z)  (x ^ y ^ z)
-#define F2(x,y,z)  ((x & y) | (z & (x | y)))
-#define F3(x,y,z)  (x ^ y ^ z)
-
-static void sha1_compress(struct sha1_state *sha1, unsigned char *buf)
-{
-    SHA1_INT32 a,b,c,d,e,W[80],i;
-
-    /* copy the state into 512-bits into W[0..15] */
-    for (i = 0; i < 16; i++) {
-        LOAD32H(W[i], buf + (4*i));
-    }
-
-    /* copy state */
-    a = sha1->state[0];
-    b = sha1->state[1];
-    c = sha1->state[2];
-    d = sha1->state[3];
-    e = sha1->state[4];
-
-    /* expand it */
-    for (i = 16; i < 80; i++) {
-        W[i] = ROL(W[i-3] ^ W[i-8] ^ W[i-14] ^ W[i-16], 1);
-    }
-
-    /* compress */
-    /* round one */
-    #define FF_0(a,b,c,d,e,i) e = (ROLc(a, 5) + F0(b,c,d) + e + W[i] + 0x5a827999UL); b = ROLc(b, 30);
-    #define FF_1(a,b,c,d,e,i) e = (ROLc(a, 5) + F1(b,c,d) + e + W[i] + 0x6ed9eba1UL); b = ROLc(b, 30);
-    #define FF_2(a,b,c,d,e,i) e = (ROLc(a, 5) + F2(b,c,d) + e + W[i] + 0x8f1bbcdcUL); b = ROLc(b, 30);
-    #define FF_3(a,b,c,d,e,i) e = (ROLc(a, 5) + F3(b,c,d) + e + W[i] + 0xca62c1d6UL); b = ROLc(b, 30);
-
-    for (i = 0; i < 20; ) {
-       FF_0(a,b,c,d,e,i++);
-       FF_0(e,a,b,c,d,i++);
-       FF_0(d,e,a,b,c,i++);
-       FF_0(c,d,e,a,b,i++);
-       FF_0(b,c,d,e,a,i++);
-    }
-
-    /* round two */
-    for (; i < 40; )  {
-       FF_1(a,b,c,d,e,i++);
-       FF_1(e,a,b,c,d,i++);
-       FF_1(d,e,a,b,c,i++);
-       FF_1(c,d,e,a,b,i++);
-       FF_1(b,c,d,e,a,i++);
-    }
-
-    /* round three */
-    for (; i < 60; )  {
-       FF_2(a,b,c,d,e,i++);
-       FF_2(e,a,b,c,d,i++);
-       FF_2(d,e,a,b,c,i++);
-       FF_2(c,d,e,a,b,i++);
-       FF_2(b,c,d,e,a,i++);
-    }
-
-    /* round four */
-    for (; i < 80; )  {
-       FF_3(a,b,c,d,e,i++);
-       FF_3(e,a,b,c,d,i++);
-       FF_3(d,e,a,b,c,i++);
-       FF_3(c,d,e,a,b,i++);
-       FF_3(b,c,d,e,a,i++);
-    }
-
-    #undef FF_0
-    #undef FF_1
-    #undef FF_2
-    #undef FF_3
-
-    /* store */
-    sha1->state[0] = sha1->state[0] + a;
-    sha1->state[1] = sha1->state[1] + b;
-    sha1->state[2] = sha1->state[2] + c;
-    sha1->state[3] = sha1->state[3] + d;
-    sha1->state[4] = sha1->state[4] + e;
-}
-
-/**
-   Initialize the hash state
-   @param sha1   The hash state you wish to initialize
-*/
-static void
-sha1_init(struct sha1_state *sha1)
-{
-   assert(sha1 != NULL);
-   sha1->state[0] = 0x67452301UL;
-   sha1->state[1] = 0xefcdab89UL;
-   sha1->state[2] = 0x98badcfeUL;
-   sha1->state[3] = 0x10325476UL;
-   sha1->state[4] = 0xc3d2e1f0UL;
-   sha1->curlen = 0;
-   sha1->length = 0;
-}
-
-/**
-   Process a block of memory though the hash
-   @param sha1   The hash state
-   @param in     The data to hash
-   @param inlen  The length of the data (octets)
-*/
-static void
-sha1_process(struct sha1_state *sha1,
-                  const unsigned char *in, Py_ssize_t inlen)
-{
-    Py_ssize_t n;
-
-    assert(sha1 != NULL);
-    assert(in != NULL);
-    assert(sha1->curlen <= sizeof(sha1->buf));
-
-    while (inlen > 0) {
-        if (sha1->curlen == 0 && inlen >= SHA1_BLOCKSIZE) {
-           sha1_compress(sha1, (unsigned char *)in);
-           sha1->length   += SHA1_BLOCKSIZE * 8;
-           in             += SHA1_BLOCKSIZE;
-           inlen          -= SHA1_BLOCKSIZE;
-        } else {
-           n = Py_MIN(inlen, (Py_ssize_t)(SHA1_BLOCKSIZE - sha1->curlen));
-           memcpy(sha1->buf + sha1->curlen, in, (size_t)n);
-           sha1->curlen   += (SHA1_INT32)n;
-           in             += n;
-           inlen          -= n;
-           if (sha1->curlen == SHA1_BLOCKSIZE) {
-              sha1_compress(sha1, sha1->buf);
-              sha1->length += 8*SHA1_BLOCKSIZE;
-              sha1->curlen = 0;
-           }
-       }
-    }
-}
-
-/**
-   Terminate the hash to get the digest
-   @param sha1  The hash state
-   @param out [out] The destination of the hash (20 bytes)
-*/
-static void
-sha1_done(struct sha1_state *sha1, unsigned char *out)
-{
-    int i;
-
-    assert(sha1 != NULL);
-    assert(out != NULL);
-    assert(sha1->curlen < sizeof(sha1->buf));
-
-    /* increase the length of the message */
-    sha1->length += sha1->curlen * 8;
-
-    /* append the '1' bit */
-    sha1->buf[sha1->curlen++] = (unsigned char)0x80;
-
-    /* if the length is currently above 56 bytes we append zeros
-     * then compress.  Then we can fall back to padding zeros and length
-     * encoding like normal.
-     */
-    if (sha1->curlen > 56) {
-        while (sha1->curlen < 64) {
-            sha1->buf[sha1->curlen++] = (unsigned char)0;
-        }
-        sha1_compress(sha1, sha1->buf);
-        sha1->curlen = 0;
-    }
-
-    /* pad up to 56 bytes of zeroes */
-    while (sha1->curlen < 56) {
-        sha1->buf[sha1->curlen++] = (unsigned char)0;
-    }
-
-    /* store length */
-    STORE64H(sha1->length, sha1->buf+56);
-    sha1_compress(sha1, sha1->buf);
-
-    /* copy output */
-    for (i = 0; i < 5; i++) {
-        STORE32H(sha1->state[i], out+(4*i));
-    }
-}
-
-
-/* .Source: /cvs/libtom/libtomcrypt/src/hashes/sha1.c,v $ */
-/* .Revision: 1.10 $ */
-/* .Date: 2007/05/12 14:25:28 $ */
-
-/*
- * End of copied SHA1 code.
- *
- * ------------------------------------------------------------------------
- */
 
 typedef struct {
     PyTypeObject* sha1_type;
@@ -328,8 +84,9 @@ SHA1_traverse(PyObject *ptr, visitproc visit, void *arg)
 }
 
 static void
-SHA1_dealloc(PyObject *ptr)
+SHA1_dealloc(SHA1object *ptr)
 {
+    Hacl_Streaming_SHA1_legacy_free(ptr->hash_state);
     PyTypeObject *tp = Py_TYPE(ptr);
     PyObject_GC_UnTrack(ptr);
     PyObject_GC_Del(ptr);
@@ -357,7 +114,7 @@ SHA1Type_copy_impl(SHA1object *self, PyTypeObject *cls)
     if ((newobj = newSHA1object(st)) == NULL)
         return NULL;
 
-    newobj->hash_state = self->hash_state;
+    newobj->hash_state = Hacl_Streaming_SHA1_legacy_copy(self->hash_state);
     return (PyObject *)newobj;
 }
 
@@ -372,10 +129,7 @@ SHA1Type_digest_impl(SHA1object *self)
 /*[clinic end generated code: output=2f05302a7aa2b5cb input=13824b35407444bd]*/
 {
     unsigned char digest[SHA1_DIGESTSIZE];
-    struct sha1_state temp;
-
-    temp = self->hash_state;
-    sha1_done(&temp, digest);
+    Hacl_Streaming_SHA1_legacy_finish(self->hash_state, digest);
     return PyBytes_FromStringAndSize((const char *)digest, SHA1_DIGESTSIZE);
 }
 
@@ -390,15 +144,21 @@ SHA1Type_hexdigest_impl(SHA1object *self)
 /*[clinic end generated code: output=4161fd71e68c6659 input=97691055c0c74ab0]*/
 {
     unsigned char digest[SHA1_DIGESTSIZE];
-    struct sha1_state temp;
-
-    /* Get the raw (binary) digest value */
-    temp = self->hash_state;
-    sha1_done(&temp, digest);
-
+    Hacl_Streaming_SHA1_legacy_finish(self->hash_state, digest);
     return _Py_strhex((const char *)digest, SHA1_DIGESTSIZE);
 }
 
+static void update(Hacl_Streaming_SHA1_state *state, uint8_t *buf, Py_ssize_t len) {
+#if PY_SSIZE_T_MAX > UINT32_MAX
+  while (len > UINT32_MAX) {
+    Hacl_Streaming_SHA1_legacy_update(state, buf, UINT32_MAX);
+    len -= UINT32_MAX;
+    buf += UINT32_MAX;
+  }
+#endif
+  Hacl_Streaming_SHA1_legacy_update(state, buf, (uint32_t) len);
+}
+
 /*[clinic input]
 SHA1Type.update
 
@@ -416,7 +176,7 @@ SHA1Type_update(SHA1object *self, PyObject *obj)
 
     GET_BUFFER_VIEW_OR_ERROUT(obj, &buf);
 
-    sha1_process(&self->hash_state, buf.buf, buf.len);
+    update(self->hash_state, buf.buf, buf.len);
 
     PyBuffer_Release(&buf);
     Py_RETURN_NONE;
@@ -509,7 +269,7 @@ _sha1_sha1_impl(PyObject *module, PyObject *string, int usedforsecurity)
         return NULL;
     }
 
-    sha1_init(&new->hash_state);
+    new->hash_state = Hacl_Streaming_SHA1_legacy_create_in();
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
@@ -518,7 +278,7 @@ _sha1_sha1_impl(PyObject *module, PyObject *string, int usedforsecurity)
         return NULL;
     }
     if (string) {
-        sha1_process(&new->hash_state, buf.buf, buf.len);
+        update(new->hash_state, buf.buf, buf.len);
         PyBuffer_Release(&buf);
     }