Merge pull request #1389 from MavenRain/fix-1362-xof-streaming-squeeze

Fix 1362 xof streaming squeeze

Author: jschneider-bensch

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - (libcrux-secrets) [#1460](https://github.com/cryspen/libcrux/issues/1460): Fix incorrect cmp in aarch64 select/swap implementation
 - (libcrux-sha3) [#1456](https://github.com/cryspen/libcrux/pull/1456): Fix out of bounds indexing in avx2 SHAKE-256 implementation
+- (libcrux-sha3) [#1389](https://github.com/celabshq/libcrux/pull/1389): Fix partial Block output of incremental XOF API
 
 ### Changed
 

combined_extraction/generated/code_gen.txt

@@ -3,4 +3,4 @@ Charon: e656e17bff6ca5efac8ab6919b9b74cb9a8dd8ad
 Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
 Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
 F*: 7b347386330d0e5a331a220535b6f15288903234
-Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6

combined_extraction/generated/combined_core.h

@@ -8,7 +8,7 @@
  * Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
  * Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
  * F*: 7b347386330d0e5a331a220535b6f15288903234
- * Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+ * Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6
  */
 
 
@@ -210,7 +210,7 @@ with const generics
 - N= 1184
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_to_shared_210(const Eurydice_arr_5f *a, size_t r)
+Eurydice_array_to_subslice_to_shared_212(const Eurydice_arr_5f *a, size_t r)
 {
   Eurydice_borrow_slice_u8 lit;
   lit.ptr = a->data;
@@ -646,18 +646,6 @@ with const generics
 */
 typedef struct Eurydice_arr_c5_s { uint8_t data[168U]; } Eurydice_arr_c5;
 
-/**
-A monomorphic instance of Eurydice.array_to_subslice_shared
-with types uint8_t, core_ops_range_Range size_t, Eurydice_derefed_slice uint8_t
-with const generics
-- N= 168
-*/
-static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d46(const Eurydice_arr_c5 *a, core_ops_range_Range_87 r)
-{
-  return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
-}
-
 /**
 A monomorphic instance of Eurydice.arr
 with types Eurydice_arr_c5
@@ -709,7 +697,7 @@ with const generics
 - N= 504
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d45(const Eurydice_arr_79 *a, core_ops_range_Range_87 r)
+Eurydice_array_to_subslice_shared_d46(const Eurydice_arr_79 *a, core_ops_range_Range_87 r)
 {
   return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
@@ -868,7 +856,7 @@ with const generics
 - N= 1088
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d44(const Eurydice_arr_2b *a, core_ops_range_Range_87 r)
+Eurydice_array_to_subslice_shared_d45(const Eurydice_arr_2b *a, core_ops_range_Range_87 r)
 {
   return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
@@ -1114,7 +1102,7 @@ with const generics
 - N= 24
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d43(const Eurydice_arr_94 *a, core_ops_range_Range_87 r)
+Eurydice_array_to_subslice_shared_d44(const Eurydice_arr_94 *a, core_ops_range_Range_87 r)
 {
   return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
@@ -1152,7 +1140,7 @@ with const generics
 - N= 16
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d42(const Eurydice_arr_b2 *a, core_ops_range_Range_87 r)
+Eurydice_array_to_subslice_shared_d43(const Eurydice_arr_b2 *a, core_ops_range_Range_87 r)
 {
   return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
@@ -1184,7 +1172,7 @@ with const generics
 - N= 19
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d41(const Eurydice_arr_38 *a, core_ops_range_Range_87 r)
+Eurydice_array_to_subslice_shared_d42(const Eurydice_arr_38 *a, core_ops_range_Range_87 r)
 {
   return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
@@ -1525,18 +1513,6 @@ Eurydice_array_to_subslice_from_shared_5f(const Eurydice_arr_ff *a, size_t r)
   return (Eurydice_borrow_slice_u8{ a->data + r, (size_t)136U - r });
 }
 
-/**
-A monomorphic instance of Eurydice.array_to_subslice_shared
-with types uint8_t, core_ops_range_Range size_t, Eurydice_derefed_slice uint8_t
-with const generics
-- N= 136
-*/
-static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d40(const Eurydice_arr_ff *a, core_ops_range_Range_87 r)
-{
-  return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
-}
-
 /**
  Declassify secret memory.
 
@@ -2010,20 +1986,6 @@ typedef struct Eurydice_arr_c5_x4_s
 }
 Eurydice_arr_c5_x4;
 
-/**
-A monomorphic instance of Eurydice.array_to_slice_mut
-with types uint8_t
-with const generics
-- N= 168
-*/
-static inline Eurydice_mut_borrow_slice_u8 Eurydice_array_to_slice_mut_2c(Eurydice_arr_c5 *a)
-{
-  Eurydice_mut_borrow_slice_u8 lit;
-  lit.ptr = a->data;
-  lit.meta = (size_t)168U;
-  return lit;
-}
-
 /**
 A monomorphic instance of Eurydice.array_to_slice_mut
 with types uint8_t
@@ -2047,28 +2009,14 @@ typedef struct Eurydice_arr_ff_x4_s
 }
 Eurydice_arr_ff_x4;
 
-/**
-A monomorphic instance of Eurydice.array_to_slice_mut
-with types uint8_t
-with const generics
-- N= 136
-*/
-static inline Eurydice_mut_borrow_slice_u8 Eurydice_array_to_slice_mut_58(Eurydice_arr_ff *a)
-{
-  Eurydice_mut_borrow_slice_u8 lit;
-  lit.ptr = a->data;
-  lit.meta = (size_t)136U;
-  return lit;
-}
-
 /**
 A monomorphic instance of Eurydice.array_to_subslice_shared
 with types uint8_t, core_ops_range_Range size_t, Eurydice_derefed_slice uint8_t
 with const generics
 - N= 32
 */
 static inline Eurydice_borrow_slice_u8
-Eurydice_array_to_subslice_shared_d4(const Eurydice_arr_ec *a, core_ops_range_Range_87 r)
+Eurydice_array_to_subslice_shared_d41(const Eurydice_arr_ec *a, core_ops_range_Range_87 r)
 {
   return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
@@ -2109,6 +2057,47 @@ Eurydice_array_to_subslice_mut_d46(Eurydice_arr_ec *a, core_ops_range_Range_87 r
   return (Eurydice_mut_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
 
+/**
+A monomorphic instance of Eurydice.array_to_subslice_to_shared
+with types uint8_t, core_ops_range_RangeTo size_t, Eurydice_derefed_slice uint8_t
+with const generics
+- N= 168
+*/
+static inline Eurydice_borrow_slice_u8
+Eurydice_array_to_subslice_to_shared_211(const Eurydice_arr_c5 *a, size_t r)
+{
+  Eurydice_borrow_slice_u8 lit;
+  lit.ptr = a->data;
+  lit.meta = r;
+  return lit;
+}
+
+/**
+A monomorphic instance of Eurydice.array_to_slice_mut
+with types uint8_t
+with const generics
+- N= 168
+*/
+static inline Eurydice_mut_borrow_slice_u8 Eurydice_array_to_slice_mut_2c(Eurydice_arr_c5 *a)
+{
+  Eurydice_mut_borrow_slice_u8 lit;
+  lit.ptr = a->data;
+  lit.meta = (size_t)168U;
+  return lit;
+}
+
+/**
+A monomorphic instance of Eurydice.array_to_subslice_shared
+with types uint8_t, core_ops_range_Range size_t, Eurydice_derefed_slice uint8_t
+with const generics
+- N= 168
+*/
+static inline Eurydice_borrow_slice_u8
+Eurydice_array_to_subslice_shared_d40(const Eurydice_arr_c5 *a, core_ops_range_Range_87 r)
+{
+  return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
+}
+
 /**
 A monomorphic instance of Eurydice.array_to_subslice_from_mut
 with types uint8_t, core_ops_range_RangeFrom size_t, Eurydice_derefed_slice uint8_t
@@ -2298,6 +2287,58 @@ Eurydice_array_to_subslice_mut_d43(Eurydice_arr_ab *a, core_ops_range_Range_87 r
   return (Eurydice_mut_borrow_slice_u8{ a->data + r.start, r.end - r.start });
 }
 
+/**
+A monomorphic instance of Eurydice.array_to_subslice_to_shared
+with types uint8_t, core_ops_range_RangeTo size_t, Eurydice_derefed_slice uint8_t
+with const generics
+- N= 136
+*/
+static inline Eurydice_borrow_slice_u8
+Eurydice_array_to_subslice_to_shared_210(const Eurydice_arr_ff *a, size_t r)
+{
+  Eurydice_borrow_slice_u8 lit;
+  lit.ptr = a->data;
+  lit.meta = r;
+  return lit;
+}
+
+/**
+A monomorphic instance of Eurydice.array_to_slice_mut
+with types uint8_t
+with const generics
+- N= 136
+*/
+static inline Eurydice_mut_borrow_slice_u8 Eurydice_array_to_slice_mut_58(Eurydice_arr_ff *a)
+{
+  Eurydice_mut_borrow_slice_u8 lit;
+  lit.ptr = a->data;
+  lit.meta = (size_t)136U;
+  return lit;
+}
+
+/**
+A monomorphic instance of Eurydice.array_to_subslice_shared
+with types uint8_t, core_ops_range_Range size_t, Eurydice_derefed_slice uint8_t
+with const generics
+- N= 136
+*/
+static inline Eurydice_borrow_slice_u8
+Eurydice_array_to_subslice_shared_d4(const Eurydice_arr_ff *a, core_ops_range_Range_87 r)
+{
+  return (Eurydice_borrow_slice_u8{ a->data + r.start, r.end - r.start });
+}
+
+/**
+A monomorphic instance of Eurydice.slice_subslice_to_mut
+with types uint8_t, core_ops_range_RangeTo size_t, Eurydice_derefed_slice uint8_t
+
+*/
+static inline Eurydice_mut_borrow_slice_u8
+Eurydice_slice_subslice_to_mut_72(Eurydice_mut_borrow_slice_u8 s, size_t r)
+{
+  return (Eurydice_mut_borrow_slice_u8{ s.ptr, r });
+}
+
 /**
 A monomorphic instance of Eurydice.slice_subslice_to_shared
 with types uint8_t, core_ops_range_RangeTo size_t, Eurydice_derefed_slice uint8_t

combined_extraction/generated/header.txt

@@ -8,5 +8,5 @@
  * Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
  * Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
  * F*: 7b347386330d0e5a331a220535b6f15288903234
- * Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+ * Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6
  */

combined_extraction/generated/libcrux_ct_ops.h

@@ -8,7 +8,7 @@
  * Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
  * Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
  * F*: 7b347386330d0e5a331a220535b6f15288903234
- * Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+ * Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6
  */
 
 

combined_extraction/generated/libcrux_mldsa65_avx2.h

@@ -8,7 +8,7 @@
  * Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
  * Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
  * F*: 7b347386330d0e5a331a220535b6f15288903234
- * Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+ * Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6
  */
 
 

combined_extraction/generated/libcrux_mldsa65_portable.h

@@ -8,7 +8,7 @@
  * Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
  * Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
  * F*: 7b347386330d0e5a331a220535b6f15288903234
- * Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+ * Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6
  */
 
 

combined_extraction/generated/libcrux_mldsa_avx2.h

@@ -8,7 +8,7 @@
  * Eurydice: aaa9fa657fb6f09802edb890252040d94cd93982
  * Karamel: 8c19d41458ce5cbfea029ebc03334ba96d149039
  * F*: 7b347386330d0e5a331a220535b6f15288903234
- * Libcrux: c2593afcf1c70df94fe6b696747fa02197763c3b
+ * Libcrux: bc35d2f21221fbea025ce4f6780bea527ee525d6
  */
 
 
@@ -1239,7 +1239,7 @@ libcrux_ml_dsa_simd_avx2_encoding_gamma1_serialize_when_gamma1_is_2_pow_19(
       (core_ops_range_Range_87{ (size_t)10U, (size_t)26U })),
     upper_4);
   Eurydice_slice_copy(out,
-    Eurydice_array_to_subslice_shared_d4(&serialized,
+    Eurydice_array_to_subslice_shared_d41(&serialized,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)20U })),
     uint8_t);
 }
@@ -1305,7 +1305,7 @@ libcrux_ml_dsa_simd_avx2_encoding_gamma1_serialize_when_gamma1_is_2_pow_17(
       (core_ops_range_Range_87{ (size_t)9U, (size_t)25U })),
     upper_4);
   Eurydice_slice_copy(out,
-    Eurydice_array_to_subslice_shared_d4(&serialized,
+    Eurydice_array_to_subslice_shared_d41(&serialized,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)18U })),
     uint8_t);
 }
@@ -1681,7 +1681,7 @@ libcrux_ml_dsa_simd_avx2_encoding_commitment_serialize(
             (core_ops_range_Range_87{ (size_t)0U, (size_t)16U })),
           libcrux_ml_dsa_simd_avx2_encoding_commitment_serialize_4(simd_unit));
         Eurydice_slice_copy(out,
-          Eurydice_array_to_subslice_shared_d41(&serialized,
+          Eurydice_array_to_subslice_shared_d42(&serialized,
             (core_ops_range_Range_87{ (size_t)0U, (size_t)4U })),
           uint8_t);
         break;
@@ -1700,7 +1700,7 @@ libcrux_ml_dsa_simd_avx2_encoding_commitment_serialize(
             (core_ops_range_Range_87{ (size_t)3U, (size_t)19U })),
           upper_3);
         Eurydice_slice_copy(out,
-          Eurydice_array_to_subslice_shared_d41(&serialized,
+          Eurydice_array_to_subslice_shared_d42(&serialized,
             (core_ops_range_Range_87{ (size_t)0U, (size_t)6U })),
           uint8_t);
         break;
@@ -1786,7 +1786,7 @@ libcrux_ml_dsa_simd_avx2_encoding_error_serialize_when_eta_is_4(
       (core_ops_range_Range_87{ (size_t)0U, (size_t)16U })),
     adjacent_4_combined);
   Eurydice_slice_copy(out,
-    Eurydice_array_to_subslice_shared_d42(&serialized,
+    Eurydice_array_to_subslice_shared_d43(&serialized,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)4U })),
     uint8_t);
 }
@@ -1892,7 +1892,7 @@ libcrux_ml_dsa_simd_avx2_encoding_error_serialize_when_eta_is_2(
       (core_ops_range_Range_87{ (size_t)0U, (size_t)16U })),
     adjacent_6_combined);
   Eurydice_slice_copy(out,
-    Eurydice_array_to_subslice_shared_d42(&serialized,
+    Eurydice_array_to_subslice_shared_d43(&serialized,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)3U })),
     uint8_t);
 }
@@ -2060,7 +2060,7 @@ libcrux_ml_dsa_simd_avx2_encoding_t0_serialize(
   libcrux_intrinsics_avx2_mm_storeu_bytes_si128(Eurydice_array_to_slice_mut_29(&serialized),
     bits_sequential);
   Eurydice_slice_copy(out,
-    Eurydice_array_to_subslice_shared_d42(&serialized,
+    Eurydice_array_to_subslice_shared_d43(&serialized,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)13U })),
     uint8_t);
 }
@@ -2203,7 +2203,7 @@ libcrux_ml_dsa_simd_avx2_encoding_t1_serialize(
       (core_ops_range_Range_87{ (size_t)5U, (size_t)21U })),
     upper_4);
   Eurydice_slice_copy(out,
-    Eurydice_array_to_subslice_shared_d43(&serialized,
+    Eurydice_array_to_subslice_shared_d44(&serialized,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)10U })),
     uint8_t);
 }
@@ -6611,7 +6611,7 @@ libcrux_ml_dsa_sample_sample_challenge_ring_element_18(
   randomness0 = libcrux_ml_dsa_hash_functions_simd256_squeeze_first_block_8c(&state);
   Eurydice_array_u8x8 arr;
   memcpy(arr.data,
-    Eurydice_array_to_subslice_shared_d40(&randomness0,
+    Eurydice_array_to_subslice_shared_d4(&randomness0,
       (core_ops_range_Range_87{ (size_t)0U, (size_t)8U })).ptr,
     (size_t)8U * sizeof (uint8_t));
   uint64_t