Reinstate missing buffer.

Signed-off-by: Brendan Moran <[email protected]>

Author: bremoran

mldsa/fips202/native/armv8.1_m/src/bit_interleave_4x_opt.S

@@ -386,8 +386,7 @@ KeccakF1600x4_LoadBytesInLane:
     vpop {d8 - d11}
     pop {r4-r11, pc}
 
-#endif /* MLD_FIPS202_ARMV81M_NEED_X4 && \
-    MLD_CONFIG_MULTILEVEL_NO_SHARED */
+#endif /* MLD_FIPS202_ARMV81M_NEED_X4 && !MLD_CONFIG_MULTILEVEL_NO_SHARED */
 
 
 

mldsa/fips202/native/armv8.1_m/src/keccakf1600_adomnicai_m4_opt_m7.S

@@ -4004,5 +4004,4 @@ KeccakF1600_StatePermute_RoundLoop:
 
 .size KeccakF1600_StatePermute_adomnicai_m4_opt_m7, .-KeccakF1600_StatePermute_adomnicai_m4_opt_m7
 
-#endif /* MLD_FIPS202_ARMV81M_NEED_X1 && \
-    MLD_CONFIG_MULTILEVEL_NO_SHARED */
+#endif /* MLD_FIPS202_ARMV81M_NEED_X1 && !MLD_CONFIG_MULTILEVEL_NO_SHARED */

mldsa/fips202/native/armv8.1_m/src/mve-keccak-4x.c

@@ -178,9 +178,8 @@ void KeccakF1600x4_StateExtract_bytes(void *state, unsigned char *data0,
     extract_bytes_in_lane(state, data0, data1, data2, data3, offset, length);
   }
 }
-#else /* MLD_FIPS202_ARMV81M_NEED_X4 && \
-    MLD_CONFIG_MULTILEVEL_NO_SHARED */
-  MLD_EMPTY_CU(fips202_armv8_1_m_mve_keccak_4x)
+#else /* MLD_FIPS202_ARMV81M_NEED_X4 && !MLD_CONFIG_MULTILEVEL_NO_SHARED */
+MLD_EMPTY_CU(fips202_armv8_1_m_mve_keccak_4x)
 
-#endif /* !(MLD_FIPS202_ARMV81M_NEED_X4 && \
-    MLD_CONFIG_MULTILEVEL_NO_SHARED) */
+#endif /* !(MLD_FIPS202_ARMV81M_NEED_X4 && !MLD_CONFIG_MULTILEVEL_NO_SHARED) \
+        */

mldsa/fips202/native/armv8.1_m/src/mve-keccak-4x_opt_m55.S

@@ -1646,5 +1646,4 @@ roundend:
     vpop {d8-d15}
     ldmia.w sp!, {r3,r4,r5,r6,r7,r8,r9,r10,r11,r12, pc}
 
-#endif /* MLD_FIPS202_ARMV81M_NEED_X4 && \
-    MLD_CONFIG_MULTILEVEL_NO_SHARED */
+#endif /* MLD_FIPS202_ARMV81M_NEED_X4 && !MLD_CONFIG_MULTILEVEL_NO_SHARED */

test/test_unit.c

@@ -220,12 +220,11 @@ static void unpack_x4_native(
     {
       ev_off = even_lane_off + (size_t)ch * 4u;
       od_off = odd_lane_off + (size_t)ch * 4u;
-      even32 =
-          (uint32_t)b[ev_off + 0] | ((uint32_t)b[ev_off + 1] << 8) |
-          ((uint32_t)b[ev_off + 2] << 16) | ((uint32_t)b[ev_off + 3] << 24);
-      odd32 =
-          (uint32_t)b[od_off + 0] | ((uint32_t)b[od_off + 1] << 8) |
-          ((uint32_t)b[od_off + 2] << 16) | ((uint32_t)b[od_off + 3] << 24);
+      even32 = (uint32_t)b[ev_off + 0] | ((uint32_t)b[ev_off + 1] << 8) |
+               ((uint32_t)b[ev_off + 2] << 16) |
+               ((uint32_t)b[ev_off + 3] << 24);
+      odd32 = (uint32_t)b[od_off + 0] | ((uint32_t)b[od_off + 1] << 8) |
+              ((uint32_t)b[od_off + 2] << 16) | ((uint32_t)b[od_off + 3] << 24);
       ch_interleaved_out[ch][lane] = ((uint64_t)odd32 << 32) | (uint64_t)even32;
     }
   }
@@ -795,9 +794,9 @@ static int test_x4_permute(void)
   {
     uint64_t init[4][MLD_KECCAK_LANES];
     uint64_t ref[4][MLD_KECCAK_LANES];
+    uint64_t x4buf[MLD_KECCAK_LANES * MLD_KECCAK_WAY];
 
 #if defined(MLD_USE_FIPS202_X4_XOR_NATIVE)
-    uint64_t x4buf[MLD_KECCAK_LANES * MLD_KECCAK_WAY];
     uint64_t inter[4][MLD_KECCAK_LANES];
     uint64_t inter_out[4][MLD_KECCAK_LANES];
 #endif