More C90 fixes

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

Author: bremoran

test/test_unit.c

@@ -499,6 +499,8 @@ static int test_shake128x4_api(void)
 
   for (ai = 0; ai < absorb_count; ai++)
   {
+    test_priv_shake128x4ctx ref_ctx;
+    mld_shake128x4ctx dut_ctx;
     inlen = absorb_lens[ai];
     for (ch = 0; ch < MLD_KECCAK_WAY; ch++)
     {
@@ -508,8 +510,6 @@ static int test_shake128x4_api(void)
       }
     }
 
-    test_priv_shake128x4ctx ref_ctx;
-    mld_shake128x4ctx dut_ctx;
     test_priv_shake128x4_absorb_once(&ref_ctx, in[0], in[1], in[2], in[3],
                                      inlen);
     mld_shake128x4_absorb_once(&dut_ctx, in[0], in[1], in[2], in[3], inlen);
@@ -570,6 +570,8 @@ static int test_shake256x4_api(void)
 
   for (ai = 0; ai < absorb_count; ai++)
   {
+    test_priv_shake256x4ctx ref_ctx;
+    mld_shake256x4ctx dut_ctx;
     inlen = absorb_lens[ai];
     for (ch = 0; ch < MLD_KECCAK_WAY; ch++)
     {
@@ -579,8 +581,6 @@ static int test_shake256x4_api(void)
       }
     }
 
-    test_priv_shake256x4ctx ref_ctx;
-    mld_shake256x4ctx dut_ctx;
     test_priv_shake256x4_absorb_once(&ref_ctx, in[0], in[1], in[2], in[3],
                                      inlen);
     mld_shake256x4_absorb_once(&dut_ctx, in[0], in[1], in[2], in[3], inlen);
@@ -794,12 +794,19 @@ static int test_x4_permute(void)
   /* Testcase 2: randomized per-channel states */
   {
     uint64_t init[4][MLD_KECCAK_LANES];
+    uint64_t ref[4][MLD_KECCAK_LANES];
+
+#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
+
     randombytes((uint8_t *)init[0], sizeof init[0]);
     randombytes((uint8_t *)init[1], sizeof init[1]);
     randombytes((uint8_t *)init[2], sizeof init[2]);
     randombytes((uint8_t *)init[3], sizeof init[3]);
 
-    uint64_t ref[4][MLD_KECCAK_LANES];
     memcpy(ref[0], init[0], sizeof ref[0]);
     memcpy(ref[1], init[1], sizeof ref[1]);
     memcpy(ref[2], init[2], sizeof ref[2]);
@@ -809,16 +816,13 @@ static int test_x4_permute(void)
     test_priv_keccakf1600_permute(ref[2]);
     test_priv_keccakf1600_permute(ref[3]);
 
-    uint64_t x4buf[MLD_KECCAK_LANES * MLD_KECCAK_WAY];
 #if defined(MLD_USE_FIPS202_X4_XOR_NATIVE)
-    uint64_t inter[4][MLD_KECCAK_LANES];
     for (ch = 0; ch < 4; ch++)
     {
       interleave_state(inter[ch], init[ch]);
     }
     pack_x4_native(x4buf, inter);
     mld_keccakf1600x4_permute(x4buf);
-    uint64_t inter_out[4][MLD_KECCAK_LANES];
     unpack_x4_native(inter_out, x4buf);
     for (ch = 0; ch < 4; ch++)
     {
@@ -870,10 +874,12 @@ static int test_xor_bytes(void)
     {
       uint64_t ref_s[MLD_KECCAK_LANES] = {0};
       uint64_t nat_s[MLD_KECCAK_LANES] = {0};
+#if defined(MLD_USE_FIPS202_X1_XOR_NATIVE)
+      uint64_t nat_s_norm[MLD_KECCAK_LANES];
+#endif
       test_priv_keccakf1600_xor_bytes(ref_s, data, off, len);
       mld_keccakf1600_xor_bytes(nat_s, data, off, len);
 #if defined(MLD_USE_FIPS202_X1_XOR_NATIVE)
-      uint64_t nat_s_norm[MLD_KECCAK_LANES];
       deinterleave_state(nat_s_norm, nat_s);
       CHECK(memcmp(ref_s, nat_s_norm, sizeof ref_s) == 0);
 #else