Use skein symbolic constants in tests.

* testsuite/skein256-test.c: Use symbolic constants.

diff --git a/ChangeLog b/ChangeLog
index 53da0cc3e7e79f15344697db4f84a6f19a3f5169..df76fd5cb2b1dc2b07079599486826a0a056fe9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-27  Niels Möller  <nisse@lysator.liu.se>
+
+       * testsuite/skein256-test.c: Use symbolic constants.
+
 2016-10-18  Niels Möller  <nisse@lysator.liu.se>
 
        * skein512-internal.c (_skein512_block): New file and function.

diff --git a/testsuite/skein256-test.c b/testsuite/skein256-test.c
index 01b4b05324388c0efcb53f6c985671c76bdfe3ab..9584cebb6ad8e47f0e64bd118806b3600c8a91af 100644 (file)
--- a/testsuite/skein256-test.c
+++ b/testsuite/skein256-test.c
@@ -14,8 +14,8 @@ print_array(const char *label, size_t n, const uint64_t *x)
 }
 
 static void
-test_skein256_block (const uint64_t keys[4],
-                    const uint64_t tweak[2],
+test_skein256_block (const uint64_t keys[_SKEIN256_LENGTH],
+                    const uint64_t tweak[_SKEIN_NTWEAK],
                     const uint8_t msg[SKEIN256_BLOCK_SIZE],
                     const uint64_t ref[_SKEIN256_LENGTH])
 {
@@ -28,12 +28,12 @@ test_skein256_block (const uint64_t keys[4],
   if (memcmp (output, ref, sizeof(output)) != 0)
     {
       printf ("Skein 256 failed:\n");
-      print_array("key", 4, keys);
-      print_array("tweak", 2, tweak);
+      print_array("key", _SKEIN256_LENGTH, keys);
+      print_array("tweak", _SKEIN_NTWEAK, tweak);
       printf ("msg: ");
       print_hex(SKEIN256_BLOCK_SIZE, msg);
-      print_array("out", 4, output);
-      print_array("ref", 4, ref);
+      print_array("out", _SKEIN256_LENGTH, output);
+      print_array("ref", _SKEIN256_LENGTH, ref);
       FAIL();
     }
 }
@@ -44,7 +44,7 @@ test_main(void)
   /* From skein_golden_kat_short_internals.txt in
      http://www.skein-hash.info/sites/default/files/NIST_CD_102610.zip. */
   {
-    static const uint64_t zeros[4] = {
+    static const uint64_t zeros[_SKEIN256_LENGTH] = {
       0, 0, 0, 0
     };
     static const uint64_t ref[_SKEIN256_LENGTH] = {
@@ -59,17 +59,17 @@ test_main(void)
                        ref);
   }
   {
-    static const uint64_t keys[4] = {
+    static const uint64_t keys[_SKEIN256_LENGTH] = {
       0x1716151413121110ull,
       0x1F1E1D1C1B1A1918ull,
       0x2726252423222120ull,
       0x2F2E2D2C2B2A2928ull,
     };
-    static const uint64_t tweak[2] = {
+    static const uint64_t tweak[_SKEIN_NTWEAK] = {
       0x0706050403020100ull,
       0x0F0E0D0C0B0A0908ull,
     };
-    static const uint64_t ref[4] = {
+    static const uint64_t ref[_SKEIN256_LENGTH] = {
       0x277610F5036C2E1Full,
       0x25FB2ADD1267773Eull,
       0x9E1D67B3E4B06872ull,
@@ -83,10 +83,10 @@ test_main(void)
   }
   {
     /* skein256 G0 = E(zeros, tweak, config string) */
-    static const uint64_t zero_keys[4] = {
+    static const uint64_t zero_keys[_SKEIN256_LENGTH] = {
       0, 0, 0, 0
     };
-    static const uint64_t tweak[2] = {
+    static const uint64_t tweak[_SKEIN_NTWEAK] = {
       32, /* message length */
       0xc4ull << 56, /* first and final, type 4 */
     };