add more test vectors

1 files changed, 153 insertions, 28 deletions

diff --git a/tests.c b/tests.c
index a308c00..a1b94af 100644
--- a/tests.c
+++ b/tests.c
@@ -2,29 +2,12 @@
 #include "sha2.h"
 #include "tests.h"
 
-#define DEF_TEST_FUNC(size) \
-  static const size_t NUM_SHA ## size ## _TESTS = \
-    (sizeof(SHA ## size ## _TESTS) / sizeof(SHA ## size ## _TESTS[0])); \
-  \
-  static unsigned int \
-  run_sha ## size ## _tests(test_fail_cb_t on_fail) { \
-    unsigned int r = 0; \
-    uint8_t hash[SHA ## size ## _HASH_SIZE]; \
-  \
-    for (size_t i = 0; i < NUM_SHA ## size ## _TESTS; i++) { \
-      const char * const s = SHA224_TESTS[i].s; \
-      sha ## size((const uint8_t *) s, strlen(s), hash); \
-      if (memcmp(hash, SHA ## size ## _TESTS[i].h, sizeof(hash))) { \
-        on_fail(size, s, hash, SHA ## size ## _TESTS[i].h); \
-        r++; \
-      } \
-    } \
-  \
-    return r; \
-  }
+// sha2 test vectors, borrowed from here:
+// https://www.di-mgt.com.au/sha_testvectors.html
 
 static const struct {
   const char * const s;
+  const size_t n;
   const uint8_t h[SHA256_HASH_SIZE];
 } SHA256_TESTS[] = {{
   .s = "",
@@ -50,10 +33,34 @@ static const struct {
     0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67,
     0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1,
   },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+  .h = {
+    0xcf, 0x5b, 0x16, 0xa7, 0x78, 0xaf, 0x83, 0x80, 0x03, 0x6c, 0xe5,
+    0x9e, 0x7b, 0x04, 0x92, 0x37, 0x0b, 0x24, 0x9b, 0x11, 0xe8, 0xf0,
+    0x7a, 0x51, 0xaf, 0xac, 0x45, 0x03, 0x7a, 0xfe, 0xe9, 0xd1,
+  },
+}, {
+  .s = "a",
+  .n = 1000000,
+  .h = {
+    0xcd, 0xc7, 0x6e, 0x5c, 0x99, 0x14, 0xfb, 0x92, 0x81, 0xa1, 0xc7,
+    0xe2, 0x84, 0xd7, 0x3e, 0x67, 0xf1, 0x80, 0x9a, 0x48, 0xa4, 0x97,
+    0x20, 0x0e, 0x04, 0x6d, 0x39, 0xcc, 0xc7, 0x11, 0x2c, 0xd0,
+  },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmno",
+  .n = 16777216,
+  .h = {
+    0x50, 0xe7, 0x2a, 0x0e, 0x26, 0x44, 0x2f, 0xe2, 0x55, 0x2d, 0xc3,
+    0x93, 0x8a, 0xc5, 0x86, 0x58, 0x22, 0x8c, 0x0c, 0xbf, 0xb1, 0xd2,
+    0xca, 0x87, 0x2a, 0xe4, 0x35, 0x26, 0x6f, 0xcd, 0x05, 0x5e,
+  },
 }};
 
 static const struct {
   const char * const s;
+  const size_t n;
   const uint8_t h[SHA224_HASH_SIZE];
 } SHA224_TESTS[] = {{
   .s = "",
@@ -79,10 +86,34 @@ static const struct {
     0xb0, 0xc6, 0x45, 0x5c, 0xb4, 0xf5, 0x8b, 0x19,
     0x52, 0x52, 0x25, 0x25,
   },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+  .h = {
+    0xc9, 0x7c, 0xa9, 0xa5, 0x59, 0x85, 0x0c, 0xe9, 0x7a, 0x04, 0xa9,
+    0x6d, 0xef, 0x6d, 0x99, 0xa9, 0xe0, 0xe0, 0xe2, 0xab, 0x14, 0xe6,
+    0xb8, 0xdf, 0x26, 0x5f, 0xc0, 0xb3,
+  },
+}, {
+  .s = "a",
+  .n = 1000000,
+  .h = {
+    0x20, 0x79, 0x46, 0x55, 0x98, 0x0c, 0x91, 0xd8, 0xbb, 0xb4, 0xc1,
+    0xea, 0x97, 0x61, 0x8a, 0x4b, 0xf0, 0x3f, 0x42, 0x58, 0x19, 0x48,
+    0xb2, 0xee, 0x4e, 0xe7, 0xad, 0x67,
+  },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmno",
+  .n = 16777216,
+  .h = {
+    0xb5, 0x98, 0x97, 0x13, 0xca, 0x4f, 0xe4, 0x7a, 0x00, 0x9f, 0x86,
+    0x21, 0x98, 0x0b, 0x34, 0xe6, 0xd6, 0x3e, 0xd3, 0x06, 0x3b, 0x2a,
+    0x0a, 0x2c, 0x86, 0x7d, 0x8a, 0x85,
+  },
 }};
 
 static const struct {
   const char * const s;
+  const size_t n;
   const uint8_t h[SHA512_HASH_SIZE];
 } SHA512_TESTS[] = {{
   .s = "",
@@ -114,10 +145,43 @@ static const struct {
     0x57, 0x78, 0x9c, 0xa0, 0x31, 0xad, 0x85, 0xc7, 0xa7, 0x1d, 0xd7,
     0x03, 0x54, 0xec, 0x63, 0x12, 0x38, 0xca, 0x34, 0x45,
   },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+  .h = {
+    0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda, 0x8c, 0xf4, 0xf7,
+    0x28, 0x14, 0xfc, 0x14, 0x3f, 0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f,
+    0x7f, 0xa1, 0x72, 0x99, 0xae, 0xad, 0xb6, 0x88, 0x90, 0x18, 0x50,
+    0x1d, 0x28, 0x9e, 0x49, 0x00, 0xf7, 0xe4, 0x33, 0x1b, 0x99, 0xde,
+    0xc4, 0xb5, 0x43, 0x3a, 0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd, 0x26,
+    0x54, 0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09,
+  },
+}, {
+  .s = "a",
+  .n = 1000000,
+  .h = {
+    0xe7, 0x18, 0x48, 0x3d, 0x0c, 0xe7, 0x69, 0x64, 0x4e, 0x2e, 0x42,
+    0xc7, 0xbc, 0x15, 0xb4, 0x63, 0x8e, 0x1f, 0x98, 0xb1, 0x3b, 0x20,
+    0x44, 0x28, 0x56, 0x32, 0xa8, 0x03, 0xaf, 0xa9, 0x73, 0xeb, 0xde,
+    0x0f, 0xf2, 0x44, 0x87, 0x7e, 0xa6, 0x0a, 0x4c, 0xb0, 0x43, 0x2c,
+    0xe5, 0x77, 0xc3, 0x1b, 0xeb, 0x00, 0x9c, 0x5c, 0x2c, 0x49, 0xaa,
+    0x2e, 0x4e, 0xad, 0xb2, 0x17, 0xad, 0x8c, 0xc0, 0x9b,
+  },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmno",
+  .n = 16777216,
+  .h = {
+    0xb4, 0x7c, 0x93, 0x34, 0x21, 0xea, 0x2d, 0xb1, 0x49, 0xad, 0x6e,
+    0x10, 0xfc, 0xe6, 0xc7, 0xf9, 0x3d, 0x07, 0x52, 0x38, 0x01, 0x80,
+    0xff, 0xd7, 0xf4, 0x62, 0x9a, 0x71, 0x21, 0x34, 0x83, 0x1d, 0x77,
+    0xbe, 0x60, 0x91, 0xb8, 0x19, 0xed, 0x35, 0x2c, 0x29, 0x67, 0xa2,
+    0xe2, 0xd4, 0xfa, 0x50, 0x50, 0x72, 0x3c, 0x96, 0x30, 0x69, 0x1f,
+    0x1a, 0x05, 0xa7, 0x28, 0x1d, 0xbe, 0x6c, 0x10, 0x86,
+  },
 }};
 
 static const struct {
   const char * const s;
+  const size_t n;
   const uint8_t h[SHA384_HASH_SIZE];
 } SHA384_TESTS[] = {{
   .s = "",
@@ -146,20 +210,81 @@ static const struct {
     0x45, 0x5a, 0x85, 0x20, 0xbc, 0x4e, 0x6f, 0x5f, 0xe9, 0x5b, 0x1f,
     0xe3, 0xc8, 0x45, 0x2b,
   },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+  .h = {
+    0x09, 0x33, 0x0c, 0x33, 0xf7, 0x11, 0x47, 0xe8, 0x3d, 0x19, 0x2f,
+    0xc7, 0x82, 0xcd, 0x1b, 0x47, 0x53, 0x11, 0x1b, 0x17, 0x3b, 0x3b,
+    0x05, 0xd2, 0x2f, 0xa0, 0x80, 0x86, 0xe3, 0xb0, 0xf7, 0x12, 0xfc,
+    0xc7, 0xc7, 0x1a, 0x55, 0x7e, 0x2d, 0xb9, 0x66, 0xc3, 0xe9, 0xfa,
+    0x91, 0x74, 0x60, 0x39,
+  },
+}, {
+  .s = "a",
+  .n = 1000000,
+  .h = {
+    0x9d, 0x0e, 0x18, 0x09, 0x71, 0x64, 0x74, 0xcb, 0x08, 0x6e, 0x83,
+    0x4e, 0x31, 0x0a, 0x4a, 0x1c, 0xed, 0x14, 0x9e, 0x9c, 0x00, 0xf2,
+    0x48, 0x52, 0x79, 0x72, 0xce, 0xc5, 0x70, 0x4c, 0x2a, 0x5b, 0x07,
+    0xb8, 0xb3, 0xdc, 0x38, 0xec, 0xc4, 0xeb, 0xae, 0x97, 0xdd, 0xd8,
+    0x7f, 0x3d, 0x89, 0x85,
+  },
+}, {
+  .s = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmno",
+  .n = 16777216,
+  .h = {
+    0x54, 0x41, 0x23, 0x5c, 0xc0, 0x23, 0x53, 0x41, 0xed, 0x80, 0x6a,
+    0x64, 0xfb, 0x35, 0x47, 0x42, 0xb5, 0xe5, 0xc0, 0x2a, 0x3c, 0x5c,
+    0xb7, 0x1b, 0x5f, 0x63, 0xfb, 0x79, 0x34, 0x58, 0xd8, 0xfd, 0xae,
+    0x59, 0x9c, 0x8c, 0xd8, 0x88, 0x49, 0x43, 0xc0, 0x4f, 0x11, 0xb3,
+    0x1b, 0x89, 0xf0, 0x23,
+  },
 }};
 
+#define DEF_TEST_FUNC(size) \
+  static const size_t NUM_SHA ## size ## _TESTS = \
+    (sizeof(SHA ## size ## _TESTS) / sizeof(SHA ## size ## _TESTS[0])); \
+  \
+  static unsigned int \
+  test_sha ## size (test_fail_cb_t on_fail) { \
+    unsigned int r = 0; \
+    uint8_t hash[SHA ## size ## _HASH_SIZE]; \
+  \
+    for (size_t i = 0; i < NUM_SHA ## size ## _TESTS; i++) { \
+      const char * const s = SHA ## size ## _TESTS[i].s; \
+  \
+      if (SHA ## size ## _TESTS[i].n > 0) { \
+        const size_t l = strlen(s); \
+  \
+        sha ## size ## _t ctx; \
+        sha ## size ## _init(&ctx); \
+  \
+        for (size_t j = 0; j < SHA ## size ## _TESTS[i].n; j++) { \
+          sha ## size ## _push(&ctx, (const uint8_t *) s, l); \
+        } \
+  \
+        sha ## size ## _fini(&ctx, hash); \
+      } else { \
+        sha ## size((const uint8_t *) s, strlen(s), hash); \
+      } \
+  \
+      if (memcmp(hash, SHA ## size ## _TESTS[i].h, sizeof(hash))) { \
+        on_fail(size, s, hash, SHA ## size ## _TESTS[i].h); \
+        r++; \
+      } \
+    } \
+  \
+    return r; \
+  }
+
 DEF_TEST_FUNC(256)
 DEF_TEST_FUNC(224)
 DEF_TEST_FUNC(512)
 DEF_TEST_FUNC(384)
 
 unsigned int run_tests(test_fail_cb_t on_fail) {
-  unsigned int r = 0;
-
-  r += run_sha256_tests(on_fail);
-  r += run_sha224_tests(on_fail);
-  r += run_sha512_tests(on_fail);
-  r += run_sha384_tests(on_fail);
-
-  return r;
+  return test_sha256(on_fail) +
+         test_sha224(on_fail) +
+         test_sha512(on_fail) +
+         test_sha384(on_fail);
 }