From 55450078eab105b51069f240fd767705f1280d23 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Mon, 10 Apr 2017 12:00:22 -0400
Subject: [PATCH] use compare_testvector in tests.

---
 src/hashes/blake2b.c | 12 ++++--------
 src/hashes/blake2s.c | 15 +++++++--------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/hashes/blake2b.c b/src/hashes/blake2b.c
index 3e7dd10..fa2e21d 100644
--- a/src/hashes/blake2b.c
+++ b/src/hashes/blake2b.c
@@ -411,9 +411,8 @@ int blake2b_512_test(void)
       blake2b_512_init(&md);
       blake2b_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2b_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 64) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2B_512", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
    }
    return CRYPT_OK;
 #endif
@@ -458,9 +457,8 @@ int blake2b_384_test(void)
       blake2b_384_init(&md);
       blake2b_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2b_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 48) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2B_384", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
    }
    return CRYPT_OK;
 #endif
@@ -501,9 +499,8 @@ int blake2b_256_test(void)
       blake2b_256_init(&md);
       blake2b_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2b_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 32) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2B_256", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
    }
    return CRYPT_OK;
 #endif
@@ -542,9 +539,8 @@ int blake2b_160_test(void)
       blake2b_160_init(&md);
       blake2b_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2b_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 20) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2B_160", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
    }
    return CRYPT_OK;
 #endif
diff --git a/src/hashes/blake2s.c b/src/hashes/blake2s.c
index 1c4164e..d39d45b 100644
--- a/src/hashes/blake2s.c
+++ b/src/hashes/blake2s.c
@@ -394,9 +394,9 @@ int blake2s_256_test(void)
       blake2s_256_init(&md);
       blake2s_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2s_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 32) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2S_256", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
+
    }
    return CRYPT_OK;
 #endif
@@ -437,9 +437,9 @@ int blake2s_224_test(void)
       blake2s_224_init(&md);
       blake2s_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2s_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 28) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2S_224", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
+
    }
    return CRYPT_OK;
 #endif
@@ -478,9 +478,9 @@ int blake2s_160_test(void)
       blake2s_160_init(&md);
       blake2s_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2s_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 20) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2S_160", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
+
    }
    return CRYPT_OK;
 #endif
@@ -517,9 +517,8 @@ int blake2s_128_test(void)
       blake2s_128_init(&md);
       blake2s_process(&md, (unsigned char *)tests[i].msg, (unsigned long)strlen(tests[i].msg));
       blake2s_done(&md, tmp);
-      if (XMEMCMP(tmp, tests[i].hash, 16) != 0) {
+      if (compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "BLAKE2S_128", i))
          return CRYPT_FAIL_TESTVECTOR;
-      }
    }
    return CRYPT_OK;
 #endif