Add test coverage for SHA3
authorjoshua <joshua@openbsd.org>
Wed, 19 Jul 2023 15:06:57 +0000 (15:06 +0000)
committerjoshua <joshua@openbsd.org>
Wed, 19 Jul 2023 15:06:57 +0000 (15:06 +0000)
ok tb@

regress/lib/libcrypto/sha/sha_test.c

index a04120e..3137c23 100644 (file)
@@ -1,6 +1,6 @@
-/*     $OpenBSD: sha_test.c,v 1.4 2022/09/02 13:23:05 tb Exp $ */
+/*     $OpenBSD: sha_test.c,v 1.5 2023/07/19 15:06:57 joshua Exp $ */
 /*
- * Copyright (c) 2022 Joshua Sing <joshua@hypera.dev>
+ * Copyright (c) 2022, 2023 Joshua Sing <joshua@hypera.dev>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -303,6 +303,234 @@ static const struct sha_test sha_tests[] = {
                        0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09,
                }
        },
+
+       /* SHA3-224 */
+       {
+               .algorithm = NID_sha3_224,
+               .in = "abc",
+               .in_len = 3,
+               .out = {
+                       0xe6, 0x42, 0x82, 0x4c, 0x3f, 0x8c, 0xf2, 0x4a,
+                       0xd0, 0x92, 0x34, 0xee, 0x7d, 0x3c, 0x76, 0x6f,
+                       0xc9, 0xa3, 0xa5, 0x16, 0x8d, 0x0c, 0x94, 0xad,
+                       0x73, 0xb4, 0x6f, 0xdf,
+               },
+       },
+       {
+               .algorithm = NID_sha3_224,
+               .in = "",
+               .in_len = 0,
+               .out = {
+                       0x6b, 0x4e, 0x03, 0x42, 0x36, 0x67, 0xdb, 0xb7,
+                       0x3b, 0x6e, 0x15, 0x45, 0x4f, 0x0e, 0xb1, 0xab,
+                       0xd4, 0x59, 0x7f, 0x9a, 0x1b, 0x07, 0x8e, 0x3f,
+                       0x5b, 0x5a, 0x6b, 0xc7,
+               },
+       },
+       {
+               .algorithm = NID_sha3_224,
+               .in =
+                   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmno"
+                   "mnopnopq",
+               .in_len = 56,
+               .out = {
+                       0x8a, 0x24, 0x10, 0x8b, 0x15, 0x4a, 0xda, 0x21,
+                       0xc9, 0xfd, 0x55, 0x74, 0x49, 0x44, 0x79, 0xba,
+                       0x5c, 0x7e, 0x7a, 0xb7, 0x6e, 0xf2, 0x64, 0xea,
+                       0xd0, 0xfc, 0xce, 0x33,
+               },
+       },
+       {
+               .algorithm = NID_sha3_224,
+               .in =
+                   "abcdefghbcdefghicdefghijdefghijkefghijklfghijklm"
+                   "ghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrs"
+                   "mnopqrstnopqrstu",
+               .in_len = 112,
+               .out = {
+                       0x54, 0x3e, 0x68, 0x68, 0xe1, 0x66, 0x6c, 0x1a,
+                       0x64, 0x36, 0x30, 0xdf, 0x77, 0x36, 0x7a, 0xe5,
+                       0xa6, 0x2a, 0x85, 0x07, 0x0a, 0x51, 0xc1, 0x4c,
+                       0xbf, 0x66, 0x5c, 0xbc,
+               },
+       },
+
+       /* SHA3-256 */
+       {
+               .algorithm = NID_sha3_256,
+               .in = "abc",
+               .in_len = 3,
+               .out = {
+                       0x3a, 0x98, 0x5d, 0xa7, 0x4f, 0xe2, 0x25, 0xb2,
+                       0x04, 0x5c, 0x17, 0x2d, 0x6b, 0xd3, 0x90, 0xbd,
+                       0x85, 0x5f, 0x08, 0x6e, 0x3e, 0x9d, 0x52, 0x5b,
+                       0x46, 0xbf, 0xe2, 0x45, 0x11, 0x43, 0x15, 0x32,
+               },
+       },
+       {
+               .algorithm = NID_sha3_256,
+               .in = "",
+               .in_len = 0,
+               .out = {
+                       0xa7, 0xff, 0xc6, 0xf8, 0xbf, 0x1e, 0xd7, 0x66,
+                       0x51, 0xc1, 0x47, 0x56, 0xa0, 0x61, 0xd6, 0x62,
+                       0xf5, 0x80, 0xff, 0x4d, 0xe4, 0x3b, 0x49, 0xfa,
+                       0x82, 0xd8, 0x0a, 0x4b, 0x80, 0xf8, 0x43, 0x4a,
+               },
+       },
+       {
+               .algorithm = NID_sha3_256,
+               .in =
+                   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmno"
+                   "mnopnopq",
+               .in_len = 56,
+               .out = {
+                       0x41, 0xc0, 0xdb, 0xa2, 0xa9, 0xd6, 0x24, 0x08,
+                       0x49, 0x10, 0x03, 0x76, 0xa8, 0x23, 0x5e, 0x2c,
+                       0x82, 0xe1, 0xb9, 0x99, 0x8a, 0x99, 0x9e, 0x21,
+                       0xdb, 0x32, 0xdd, 0x97, 0x49, 0x6d, 0x33, 0x76,
+               },
+       },
+       {
+               .algorithm = NID_sha3_256,
+               .in =
+                   "abcdefghbcdefghicdefghijdefghijkefghijklfghijklm"
+                   "ghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrs"
+                   "mnopqrstnopqrstu",
+               .in_len = 112,
+               .out = {
+                       0x91, 0x6f, 0x60, 0x61, 0xfe, 0x87, 0x97, 0x41,
+                       0xca, 0x64, 0x69, 0xb4, 0x39, 0x71, 0xdf, 0xdb,
+                       0x28, 0xb1, 0xa3, 0x2d, 0xc3, 0x6c, 0xb3, 0x25,
+                       0x4e, 0x81, 0x2b, 0xe2, 0x7a, 0xad, 0x1d, 0x18,
+               },
+       },
+
+       /* SHA3-384 */
+       {
+               .algorithm = NID_sha3_384,
+               .in = "abc",
+               .in_len = 3,
+               .out = {
+                       0xec, 0x01, 0x49, 0x82, 0x88, 0x51, 0x6f, 0xc9,
+                       0x26, 0x45, 0x9f, 0x58, 0xe2, 0xc6, 0xad, 0x8d,
+                       0xf9, 0xb4, 0x73, 0xcb, 0x0f, 0xc0, 0x8c, 0x25,
+                       0x96, 0xda, 0x7c, 0xf0, 0xe4, 0x9b, 0xe4, 0xb2,
+                       0x98, 0xd8, 0x8c, 0xea, 0x92, 0x7a, 0xc7, 0xf5,
+                       0x39, 0xf1, 0xed, 0xf2, 0x28, 0x37, 0x6d, 0x25,
+               },
+       },
+       {
+               .algorithm = NID_sha3_384,
+               .in = "",
+               .in_len = 0,
+               .out = {
+                       0x0c, 0x63, 0xa7, 0x5b, 0x84, 0x5e, 0x4f, 0x7d,
+                       0x01, 0x10, 0x7d, 0x85, 0x2e, 0x4c, 0x24, 0x85,
+                       0xc5, 0x1a, 0x50, 0xaa, 0xaa, 0x94, 0xfc, 0x61,
+                       0x99, 0x5e, 0x71, 0xbb, 0xee, 0x98, 0x3a, 0x2a,
+                       0xc3, 0x71, 0x38, 0x31, 0x26, 0x4a, 0xdb, 0x47,
+                       0xfb, 0x6b, 0xd1, 0xe0, 0x58, 0xd5, 0xf0, 0x04,
+               },
+       },
+       {
+               .algorithm = NID_sha3_384,
+               .in =
+                   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmno"
+                   "mnopnopq",
+               .in_len = 56,
+               .out = {
+                       0x99, 0x1c, 0x66, 0x57, 0x55, 0xeb, 0x3a, 0x4b,
+                       0x6b, 0xbd, 0xfb, 0x75, 0xc7, 0x8a, 0x49, 0x2e,
+                       0x8c, 0x56, 0xa2, 0x2c, 0x5c, 0x4d, 0x7e, 0x42,
+                       0x9b, 0xfd, 0xbc, 0x32, 0xb9, 0xd4, 0xad, 0x5a,
+                       0xa0, 0x4a, 0x1f, 0x07, 0x6e, 0x62, 0xfe, 0xa1,
+                       0x9e, 0xef, 0x51, 0xac, 0xd0, 0x65, 0x7c, 0x22,
+               },
+       },
+       {
+               .algorithm = NID_sha3_384,
+               .in =
+                   "abcdefghbcdefghicdefghijdefghijkefghijklfghijklm"
+                   "ghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrs"
+                   "mnopqrstnopqrstu",
+               .in_len = 112,
+               .out = {
+                       0x79, 0x40, 0x7d, 0x3b, 0x59, 0x16, 0xb5, 0x9c,
+                       0x3e, 0x30, 0xb0, 0x98, 0x22, 0x97, 0x47, 0x91,
+                       0xc3, 0x13, 0xfb, 0x9e, 0xcc, 0x84, 0x9e, 0x40,
+                       0x6f, 0x23, 0x59, 0x2d, 0x04, 0xf6, 0x25, 0xdc,
+                       0x8c, 0x70, 0x9b, 0x98, 0xb4, 0x3b, 0x38, 0x52,
+                       0xb3, 0x37, 0x21, 0x61, 0x79, 0xaa, 0x7f, 0xc7,
+               },
+       },
+
+       /* SHA3-512 */
+       {
+               .algorithm = NID_sha3_512,
+               .in = "abc",
+               .in_len = 3,
+               .out = {
+                       0xb7, 0x51, 0x85, 0x0b, 0x1a, 0x57, 0x16, 0x8a,
+                       0x56, 0x93, 0xcd, 0x92, 0x4b, 0x6b, 0x09, 0x6e,
+                       0x08, 0xf6, 0x21, 0x82, 0x74, 0x44, 0xf7, 0x0d,
+                       0x88, 0x4f, 0x5d, 0x02, 0x40, 0xd2, 0x71, 0x2e,
+                       0x10, 0xe1, 0x16, 0xe9, 0x19, 0x2a, 0xf3, 0xc9,
+                       0x1a, 0x7e, 0xc5, 0x76, 0x47, 0xe3, 0x93, 0x40,
+                       0x57, 0x34, 0x0b, 0x4c, 0xf4, 0x08, 0xd5, 0xa5,
+                       0x65, 0x92, 0xf8, 0x27, 0x4e, 0xec, 0x53, 0xf0,
+               },
+       },
+       {
+               .algorithm = NID_sha3_512,
+               .in = "",
+               .in_len = 0,
+               .out = {
+                       0xa6, 0x9f, 0x73, 0xcc, 0xa2, 0x3a, 0x9a, 0xc5,
+                       0xc8, 0xb5, 0x67, 0xdc, 0x18, 0x5a, 0x75, 0x6e,
+                       0x97, 0xc9, 0x82, 0x16, 0x4f, 0xe2, 0x58, 0x59,
+                       0xe0, 0xd1, 0xdc, 0xc1, 0x47, 0x5c, 0x80, 0xa6,
+                       0x15, 0xb2, 0x12, 0x3a, 0xf1, 0xf5, 0xf9, 0x4c,
+                       0x11, 0xe3, 0xe9, 0x40, 0x2c, 0x3a, 0xc5, 0x58,
+                       0xf5, 0x00, 0x19, 0x9d, 0x95, 0xb6, 0xd3, 0xe3,
+                       0x01, 0x75, 0x85, 0x86, 0x28, 0x1d, 0xcd, 0x26,
+               },
+       },
+       {
+               .algorithm = NID_sha3_512,
+               .in =
+                   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmno"
+                   "mnopnopq",
+               .in_len = 56,
+               .out = {
+                       0x04, 0xa3, 0x71, 0xe8, 0x4e, 0xcf, 0xb5, 0xb8,
+                       0xb7, 0x7c, 0xb4, 0x86, 0x10, 0xfc, 0xa8, 0x18,
+                       0x2d, 0xd4, 0x57, 0xce, 0x6f, 0x32, 0x6a, 0x0f,
+                       0xd3, 0xd7, 0xec, 0x2f, 0x1e, 0x91, 0x63, 0x6d,
+                       0xee, 0x69, 0x1f, 0xbe, 0x0c, 0x98, 0x53, 0x02,
+                       0xba, 0x1b, 0x0d, 0x8d, 0xc7, 0x8c, 0x08, 0x63,
+                       0x46, 0xb5, 0x33, 0xb4, 0x9c, 0x03, 0x0d, 0x99,
+                       0xa2, 0x7d, 0xaf, 0x11, 0x39, 0xd6, 0xe7, 0x5e,
+               },
+       },
+       {
+               .algorithm = NID_sha3_512,
+               .in =
+                   "abcdefghbcdefghicdefghijdefghijkefghijklfghijklm"
+                   "ghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrs"
+                   "mnopqrstnopqrstu",
+               .in_len = 112,
+               .out = {
+                       0xaf, 0xeb, 0xb2, 0xef, 0x54, 0x2e, 0x65, 0x79,
+                       0xc5, 0x0c, 0xad, 0x06, 0xd2, 0xe5, 0x78, 0xf9,
+                       0xf8, 0xdd, 0x68, 0x81, 0xd7, 0xdc, 0x82, 0x4d,
+                       0x26, 0x36, 0x0f, 0xee, 0xbf, 0x18, 0xa4, 0xfa,
+                       0x73, 0xe3, 0x26, 0x11, 0x22, 0x94, 0x8e, 0xfc,
+                       0xfd, 0x49, 0x2e, 0x74, 0xe8, 0x2e, 0x21, 0x89,
+                       0xed, 0x0f, 0xb4, 0x40, 0xd1, 0x87, 0xf3, 0x82,
+                       0x27, 0x0c, 0xb4, 0x55, 0xf2, 0x1d, 0xd1, 0x85,
+               },
+       },
 };
 
 struct sha_repetition_test {
@@ -382,6 +610,64 @@ static const struct sha_repetition_test sha_repetition_tests[] = {
                        0x4e, 0xad, 0xb2, 0x17, 0xad, 0x8c, 0xc0, 0x9b,
                }
        },
+
+       /* SHA3-224 */
+       {
+               .algorithm = NID_sha3_224,
+               .in = 'a',
+               .in_repetitions = 1000000,
+               .out = {
+                       0xd6, 0x93, 0x35, 0xb9, 0x33, 0x25, 0x19, 0x2e,
+                       0x51, 0x6a, 0x91, 0x2e, 0x6d, 0x19, 0xa1, 0x5c,
+                       0xb5, 0x1c, 0x6e, 0xd5, 0xc1, 0x52, 0x43, 0xe7,
+                       0xa7, 0xfd, 0x65, 0x3c,
+               },
+       },
+
+       /* SHA3-256 */
+       {
+               .algorithm = NID_sha3_256,
+               .in = 'a',
+               .in_repetitions = 1000000,
+               .out = {
+                       0x5c, 0x88, 0x75, 0xae, 0x47, 0x4a, 0x36, 0x34,
+                       0xba, 0x4f, 0xd5, 0x5e, 0xc8, 0x5b, 0xff, 0xd6,
+                       0x61, 0xf3, 0x2a, 0xca, 0x75, 0xc6, 0xd6, 0x99,
+                       0xd0, 0xcd, 0xcb, 0x6c, 0x11, 0x58, 0x91, 0xc1,
+               },
+       },
+
+       /* SHA3-384 */
+       {
+               .algorithm = NID_sha3_384,
+               .in = 'a',
+               .in_repetitions = 1000000,
+               .out = {
+                       0xee, 0xe9, 0xe2, 0x4d, 0x78, 0xc1, 0x85, 0x53,
+                       0x37, 0x98, 0x34, 0x51, 0xdf, 0x97, 0xc8, 0xad,
+                       0x9e, 0xed, 0xf2, 0x56, 0xc6, 0x33, 0x4f, 0x8e,
+                       0x94, 0x8d, 0x25, 0x2d, 0x5e, 0x0e, 0x76, 0x84,
+                       0x7a, 0xa0, 0x77, 0x4d, 0xdb, 0x90, 0xa8, 0x42,
+                       0x19, 0x0d, 0x2c, 0x55, 0x8b, 0x4b, 0x83, 0x40,
+               },
+       },
+
+       /* SHA3-512 */
+       {
+               .algorithm = NID_sha3_512,
+               .in = 'a',
+               .in_repetitions = 1000000,
+               .out = {
+                       0x3c, 0x3a, 0x87, 0x6d, 0xa1, 0x40, 0x34, 0xab,
+                       0x60, 0x62, 0x7c, 0x07, 0x7b, 0xb9, 0x8f, 0x7e,
+                       0x12, 0x0a, 0x2a, 0x53, 0x70, 0x21, 0x2d, 0xff,
+                       0xb3, 0x38, 0x5a, 0x18, 0xd4, 0xf3, 0x88, 0x59,
+                       0xed, 0x31, 0x1d, 0x0a, 0x9d, 0x51, 0x41, 0xce,
+                       0x9c, 0xc5, 0xc6, 0x6e, 0xe6, 0x89, 0xb2, 0x66,
+                       0xa8, 0xaa, 0x18, 0xac, 0xe8, 0x28, 0x2a, 0x0e,
+                       0x0d, 0xb5, 0x96, 0xc9, 0x0b, 0x0a, 0x7b, 0x87,
+               },
+       },
 };
 
 #define N_SHA_TESTS (sizeof(sha_tests) / sizeof(sha_tests[0]))
@@ -430,6 +716,30 @@ sha_hash_from_algorithm(int algorithm, const char **out_label,
                md = EVP_sha512();
                len = SHA512_DIGEST_LENGTH;
                break;
+       case NID_sha3_224:
+               label = SN_sha3_224;
+               sha_func = NULL;
+               md = EVP_sha3_224();
+               len = 224 / 8;
+               break;
+       case NID_sha3_256:
+               label = SN_sha3_256;
+               sha_func = NULL;
+               md = EVP_sha3_256();
+               len = 256 / 8;
+               break;
+       case NID_sha3_384:
+               label = SN_sha3_384;
+               sha_func = NULL;
+               md = EVP_sha3_384();
+               len = 384 / 8;
+               break;
+       case NID_sha3_512:
+               label = SN_sha3_512;
+               sha_func = NULL;
+               md = EVP_sha3_512();
+               len = 512 / 8;
+               break;
        default:
                fprintf(stderr, "FAIL: unknown algorithm (%d)\n",
                    algorithm);
@@ -473,60 +783,66 @@ sha_test(void)
                        goto failed;
 
                /* Digest */
-               memset(out, 0, sizeof(out));
-               sha_func(st->in, st->in_len, out);
-               if (memcmp(st->out, out, out_len) != 0) {
-                       fprintf(stderr, "FAIL (%s): mismatch\n", label);
-                       goto failed;
+               if (sha_func != NULL) {
+                       memset(out, 0, sizeof(out));
+                       sha_func(st->in, st->in_len, out);
+                       if (memcmp(st->out, out, out_len) != 0) {
+                               fprintf(stderr, "FAIL (%s:%zu): mismatch\n",
+                                   label, i);
+                               goto failed;
+                       }
                }
 
                /* EVP single-shot digest */
                memset(out, 0, sizeof(out));
                if (!EVP_Digest(st->in, st->in_len, out, NULL, md, NULL)) {
-                       fprintf(stderr, "FAIL (%s): EVP_Digest failed\n",
-                           label);
+                       fprintf(stderr, "FAIL (%s:%zu): EVP_Digest failed\n",
+                           label, i);
                        goto failed;
                }
 
                if (memcmp(st->out, out, out_len) != 0) {
-                       fprintf(stderr, "FAIL (%s): EVP single-shot mismatch\n",
-                           label);
+                       fprintf(stderr,
+                           "FAIL (%s:%zu): EVP single-shot mismatch\n",
+                           label, i);
                        goto failed;
                }
 
                /* EVP digest */
                memset(out, 0, sizeof(out));
                if (!EVP_DigestInit_ex(hash, md, NULL)) {
-                       fprintf(stderr, "FAIL (%s): EVP_DigestInit_ex failed\n",
-                           label);
+                       fprintf(stderr,
+                           "FAIL (%s:%zu): EVP_DigestInit_ex failed\n",
+                           label, i);
                        goto failed;
                }
 
                in_len = st->in_len / 2;
                if (!EVP_DigestUpdate(hash, st->in, in_len)) {
                        fprintf(stderr,
-                           "FAIL (%s): EVP_DigestUpdate first half failed\n",
-                           label);
+                           "FAIL (%s:%zu): EVP_DigestUpdate first half "
+                           "failed\n", label, i);
                        goto failed;
                }
 
                if (!EVP_DigestUpdate(hash, st->in + in_len,
                    st->in_len - in_len)) {
                        fprintf(stderr,
-                           "FAIL (%s): EVP_DigestUpdate second half failed\n",
-                           label);
+                           "FAIL (%s:%zu): EVP_DigestUpdate second half "
+                           "failed\n", label, i);
                        goto failed;
                }
 
                if (!EVP_DigestFinal_ex(hash, out, NULL)) {
                        fprintf(stderr,
-                           "FAIL (%s): EVP_DigestFinal_ex failed\n",
-                           label);
+                           "FAIL (%s:%zu): EVP_DigestFinal_ex failed\n",
+                           label, i);
                        goto failed;
                }
 
                if (memcmp(st->out, out, out_len) != 0) {
-                       fprintf(stderr, "FAIL (%s): EVP mismatch\n", label);
+                       fprintf(stderr, "FAIL (%s:%zu): EVP mismatch\n",
+                           label, i);
                        goto failed;
                }
        }
@@ -565,8 +881,8 @@ sha_repetition_test(void)
                /* EVP digest */
                if (!EVP_DigestInit_ex(hash, md, NULL)) {
                        fprintf(stderr,
-                           "FAIL (%s): EVP_DigestInit_ex failed\n",
-                           label);
+                           "FAIL (%s:%zu): EVP_DigestInit_ex failed\n",
+                           label, i);
                        goto failed;
                }
 
@@ -579,8 +895,8 @@ sha_repetition_test(void)
 
                        if (!EVP_DigestUpdate(hash, buf, part_len)) {
                                fprintf(stderr,
-                                   "FAIL (%s): EVP_DigestUpdate failed\n",
-                                   label);
+                                   "FAIL (%s:%zu): EVP_DigestUpdate failed\n",
+                                   label, i);
                                goto failed;
                        }
 
@@ -589,13 +905,14 @@ sha_repetition_test(void)
 
                if (!EVP_DigestFinal_ex(hash, out, NULL)) {
                        fprintf(stderr,
-                           "FAIL (%s): EVP_DigestFinal_ex failed\n",
-                           label);
+                           "FAIL (%s:%zu): EVP_DigestFinal_ex failed\n",
+                           label, i);
                        goto failed;
                }
 
                if (memcmp(st->out, out, out_len) != 0) {
-                       fprintf(stderr, "FAIL (%s): EVP mismatch\n", label);
+                       fprintf(stderr, "FAIL (%s:%zu): EVP mismatch\n",
+                           label, i);
                        goto failed;
                }
        }