Guard tests & add CHECK macro

Author: bremoran

test/test_unit.c

@@ -48,6 +48,7 @@
 
 #define STATE_BYTES (MLD_KECCAK_LANES * sizeof(uint64_t))
 
+#if defined(MLD_USE_FIPS202_X1_XOR_NATIVE) || defined(MLD_USE_FIPS202_X4_XOR_NATIVE)
 /* Bit interleave/deinterleave helpers as specified */
 static uint64_t test_priv_bit_interleave(uint64_t in)
 {
@@ -92,7 +93,9 @@ static void deinterleave_state(uint64_t out[MLD_KECCAK_LANES], const uint64_t in
 {
   for (int i = 0; i < MLD_KECCAK_LANES; i++) out[i] = test_priv_bit_deinterleave(in[i]);
 }
+#endif /* MLD_USE_FIPS202_X1_XOR_NATIVE || MLD_USE_FIPS202_X4_XOR_NATIVE */
 
+#if defined(MLD_USE_FIPS202_X4_NATIVE) && defined(MLD_USE_FIPS202_X4_XOR_NATIVE)
 /* X4 native packing: 800 bytes total: [even half(400)] [odd half(400)]
  * Each half: 25 lanes x 16 bytes; each lane holds 4x uint32 (channel 0..3)
  * Value per lane comes from bit-interleaved 64-bit: low32=even, high32=odd. */
@@ -150,7 +153,9 @@ static void unpack_x4_native(uint64_t ch_interleaved_out[MLD_KECCAK_WAY][MLD_KEC
     }
   }
 }
+#endif /* MLD_USE_FIPS202_X4_NATIVE && MLD_USE_FIPS202_X4_XOR_NATIVE */
 
+#if defined(MLD_USE_FIPS202_X4_NATIVE)
 static int test_x4_xor_bytes(void)
 {
   int fails = 0;
@@ -181,18 +186,12 @@ static int test_x4_xor_bytes(void)
         for (int ch = 0; ch < 4; ch++) {
           uint64_t norm[MLD_KECCAK_LANES];
           deinterleave_state(norm, ch_inter[ch]);
-          if (memcmp(norm, ref[ch], sizeof norm) != 0) {
-            fprintf(stderr, "x4_xor_bytes mismatch ch=%d off=%u len=%u\n", ch, off, len);
-            return ++fails;
-          }
+          CHECK(memcmp(norm, ref[ch], sizeof norm) == 0);
         }
       #else
         for (int ch = 0; ch < 4; ch++) {
           uint64_t *ch_state = ((uint64_t*)x4buf) + (size_t)ch * MLD_KECCAK_LANES;
-          if (memcmp(ch_state, ref[ch], sizeof(ref[ch])) != 0) {
-            fprintf(stderr, "x4_xor_bytes mismatch (fallback) ch=%d off=%u len=%u\n", ch, off, len);
-            return ++fails;
-          }
+          CHECK(memcmp(ch_state, ref[ch], sizeof(ref[ch])) == 0);
         }
       #endif
     }
@@ -236,10 +235,7 @@ static int test_x4_extract_bytes(void)
       test_priv_keccakf1600_extract_bytes(ref[3], out_ref[3], off, len);
       mld_keccakf1600x4_extract_bytes(x4buf, out_nat[0], out_nat[1], out_nat[2], out_nat[3], off, len);
       for (int ch = 0; ch < 4; ch++) {
-        if (memcmp(out_ref[ch], out_nat[ch], len) != 0) {
-          fprintf(stderr, "x4_extract_bytes mismatch ch=%d off=%u len=%u\n", ch, off, len);
-          return ++fails;
-        }
+        CHECK(memcmp(out_ref[ch], out_nat[ch], len) == 0);
       }
     }
   }
@@ -276,20 +272,14 @@ static int test_x4_permute(void)
       for (int ch = 0; ch < 4; ch++) {
         uint64_t norm[MLD_KECCAK_LANES];
         deinterleave_state(norm, inter_out[ch]);
-        if (memcmp(norm, ref[ch], sizeof norm) != 0) {
-          fprintf(stderr, "x4_permute mismatch (case1) ch=%d\n", ch);
-          return ++fails;
-        }
+        CHECK(memcmp(norm, ref[ch], sizeof norm) == 0);
       }
     #else
       for (int ch = 0; ch < 4; ch++) memcpy(((uint64_t*)x4buf) + (size_t)ch * MLD_KECCAK_LANES, init[ch], sizeof(init[ch]));
       mld_keccakf1600x4_permute(x4buf);
       for (int ch = 0; ch < 4; ch++) {
         uint64_t *ch_state = ((uint64_t*)x4buf) + (size_t)ch * MLD_KECCAK_LANES;
-        if (memcmp(ch_state, ref[ch], sizeof(ref[ch])) != 0) {
-          fprintf(stderr, "x4_permute mismatch (case1,fallback) ch=%d\n", ch);
-          return ++fails;
-        }
+        CHECK(memcmp(ch_state, ref[ch], sizeof(ref[ch])) == 0);
       }
     #endif
   }
@@ -323,27 +313,23 @@ static int test_x4_permute(void)
       for (int ch = 0; ch < 4; ch++) {
         uint64_t norm[MLD_KECCAK_LANES];
         deinterleave_state(norm, inter_out[ch]);
-        if (memcmp(norm, ref[ch], sizeof norm) != 0) {
-          fprintf(stderr, "x4_permute mismatch (case2) ch=%d\n", ch);
-          return ++fails;
-        }
+        CHECK(memcmp(norm, ref[ch], sizeof norm) == 0);
       }
     #else
       for (int ch = 0; ch < 4; ch++) memcpy(((uint64_t*)x4buf) + (size_t)ch * MLD_KECCAK_LANES, init[ch], sizeof(init[ch]));
       mld_keccakf1600x4_permute(x4buf);
       for (int ch = 0; ch < 4; ch++) {
         uint64_t *ch_state = ((uint64_t*)x4buf) + (size_t)ch * MLD_KECCAK_LANES;
-        if (memcmp(ch_state, ref[ch], sizeof(ref[ch])) != 0) {
-          fprintf(stderr, "x4_permute mismatch (case2,fallback) ch=%d\n", ch);
-          return ++fails;
-        }
+        CHECK(memcmp(ch_state, ref[ch], sizeof(ref[ch])) == 0);
       }
     #endif
   }
 
   return fails;
 }
+#endif /* MLD_USE_FIPS202_X4_NATIVE */
 
+#if defined(MLD_USE_FIPS202_X1_NATIVE)
 static int test_xor_bytes(void)
 {
   int fails = 0;
@@ -364,14 +350,10 @@ static int test_xor_bytes(void)
       #if defined(MLD_USE_FIPS202_X1_XOR_NATIVE)
         uint64_t nat_s_norm[MLD_KECCAK_LANES];
         deinterleave_state(nat_s_norm, nat_s);
-        if (memcmp(ref_s, nat_s_norm, sizeof ref_s) != 0) {
+        CHECK(memcmp(ref_s, nat_s_norm, sizeof ref_s) == 0);
       #else
-        if (memcmp(ref_s, nat_s, sizeof ref_s) != 0) {
+        CHECK(memcmp(ref_s, nat_s, sizeof ref_s) == 0);
       #endif
-        fprintf(stderr, "xor_bytes mismatch at off=%u len=%u\n", off, len);
-        fails++;
-        return fails; /* early exit for debug */
-      }
     }
   }
   return fails;
@@ -401,11 +383,7 @@ static int test_extract_bytes(void)
       memset(out_nat, 0, len);
       test_priv_keccakf1600_extract_bytes(ref_s, out_ref, off, len);
       mld_keccakf1600_extract_bytes(nat_s, out_nat, off, len);
-      if (memcmp(out_ref, out_nat, len) != 0) {
-        fprintf(stderr, "extract_bytes mismatch at off=%u len=%u\n", off, len);
-        fails++;
-        return fails;
-      }
+      CHECK(memcmp(out_ref, out_nat, len) == 0);
     }
   }
   return fails;
@@ -427,30 +405,32 @@ static int test_permute(void)
     mld_keccakf1600_permute(nat_s);
     uint64_t nat_s_norm[MLD_KECCAK_LANES];
     deinterleave_state(nat_s_norm, nat_s);
-    if (memcmp(ref_s, nat_s_norm, sizeof ref_s) != 0) {
+    CHECK(memcmp(ref_s, nat_s_norm, sizeof ref_s) == 0);
   #else
     memcpy(nat_s, init, sizeof nat_s);
     mld_keccakf1600_permute(nat_s);
-    if (memcmp(ref_s, nat_s, sizeof ref_s) != 0) {
+    CHECK(memcmp(ref_s, nat_s, sizeof ref_s) == 0);
   #endif
-    fprintf(stderr, "permute mismatch\n");
-    fails++;
-  }
   return fails;
 }
+#endif /* MLD_USE_FIPS202_X1_NATIVE */
 
 int main(void)
 {
   int fails = 0;
 
   randombytes_reset();
 
+#if defined(MLD_USE_FIPS202_X1_NATIVE)
   fails += test_xor_bytes();
   fails += test_extract_bytes();
   fails += test_permute();
+#endif
+#if defined(MLD_USE_FIPS202_X4_NATIVE)
   fails += test_x4_xor_bytes();
   fails += test_x4_extract_bytes();
   fails += test_x4_permute();
+#endif
 
   if (fails) {
     fprintf(stderr, "unit tests: FAILED (%d failure%s)\n", fails, fails==1?"":"s");