More C90 fixes

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

Author: bremoran

test/test_unit.c

@@ -516,9 +516,9 @@ static int test_shake128x4_api(void)
 
     for (bi = 0; bi < block_count; bi++)
     {
-      nblocks = block_counts[bi];
       test_priv_shake128x4ctx ref_copy;
       mld_shake128x4ctx dut_copy;
+      nblocks = block_counts[bi];
       memcpy(&ref_copy, &ref_ctx, sizeof(ref_ctx));
       memcpy(&dut_copy, &dut_ctx, sizeof(dut_ctx));
       for (ch = 0; ch < MLD_KECCAK_WAY; ch++)
@@ -587,9 +587,9 @@ static int test_shake256x4_api(void)
 
     for (bi = 0; bi < block_count; bi++)
     {
-      nblocks = block_counts[bi];
       test_priv_shake256x4ctx ref_copy;
       mld_shake256x4ctx dut_copy;
+      nblocks = block_counts[bi];
       memcpy(&ref_copy, &ref_ctx, sizeof(ref_ctx));
       memcpy(&dut_copy, &dut_ctx, sizeof(dut_ctx));
 
@@ -743,12 +743,17 @@ static int test_x4_permute(void)
   /* Testcase 1: first channel all 0x5555..., others zero */
   {
     uint64_t init[4][MLD_KECCAK_LANES] = {{0}};
+    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 inter_out[4][MLD_KECCAK_LANES];
+    uint64_t inter[4][MLD_KECCAK_LANES];
+#endif
     for (ch = 0; ch < 4; ch++)
     {
       init[ch][0] = 0x5555555555555555ULL;
     }
 
-    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]);
@@ -758,16 +763,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++)
     {