Skip to content

Commit df1f7bb

Browse files
committed
Deprecate compare_testvector().
This should never have been public API. Also introduce a `LTC_COMPARE_TESTVECTOR()` macro to be used within the library, which doesn't exit, but only returns an error. Signed-off-by: Steffen Jaeckel <[email protected]>
1 parent f902ce6 commit df1f7bb

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/hashes/sha3_test.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
/* based on https://github.com/brainhub/SHA3IUF (public domain) */
55

6-
#include "../../tests/common.h"
76
#include "tomcrypt_private.h"
87

98
#ifdef LTC_SHA3
@@ -488,61 +487,61 @@ int turbo_shake_test(void)
488487
/* TurboSHAKE128 on an empty buffer */
489488
turbo_shake_init(&c, 128);
490489
turbo_shake_done(&c, hash, 64);
491-
COMPARE_TESTVECTOR(hash, 64, turbo_shake_128_empty, sizeof(turbo_shake_128_empty), "TurboSHAKE128", counter++);
490+
LTC_COMPARE_TESTVECTOR(hash, 64, turbo_shake_128_empty, sizeof(turbo_shake_128_empty), "TurboSHAKE128", counter++);
492491

493492
/* TurboSHAKE128 on an empty buffer, digest length 10032 bytes, test last 32 bytes */
494493
turbo_shake_init(&c, 128);
495494
for(i = 0; i != 10000 / 10; ++i){ turbo_shake_done(&c, hash, 10); }
496495
turbo_shake_done(&c, hash, 32);
497-
COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_empty_10032, sizeof(turbo_shake_128_empty_10032), "TurboSHAKE128", counter++);
496+
LTC_COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_empty_10032, sizeof(turbo_shake_128_empty_10032), "TurboSHAKE128", counter++);
498497

499498
/* TurboSHAKE128 on single zero byte */
500499
turbo_shake_init(&c, 128);
501500
turbo_shake_process(&c, turbo_shake_input_single_zero, sizeof(turbo_shake_input_single_zero));
502501
turbo_shake_done(&c, hash, 32);
503-
COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_single_zero_byte, sizeof(turbo_shake_128_single_zero_byte), "TurboSHAKE128", counter++);
502+
LTC_COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_single_zero_byte, sizeof(turbo_shake_128_single_zero_byte), "TurboSHAKE128", counter++);
504503

505504
/* TurboSHAKE128 on ptn(17**1) */
506505
turbo_shake_init(&c, 128);
507506
turbo_shake_process(&c, turbo_shake_input_ptn_17_pow_1, sizeof(turbo_shake_input_ptn_17_pow_1));
508507
turbo_shake_done(&c, hash, 32);
509-
COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_ptn_pow_1, sizeof(turbo_shake_128_ptn_pow_1), "TurboSHAKE128", counter++);
508+
LTC_COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_ptn_pow_1, sizeof(turbo_shake_128_ptn_pow_1), "TurboSHAKE128", counter++);
510509

511510
/* TurboSHAKE128 on ptn(17**2) */
512511
turbo_shake_init(&c, 128);
513512
turbo_shake_process(&c, turbo_shake_input_ptn_17_pow_2, sizeof(turbo_shake_input_ptn_17_pow_2));
514513
turbo_shake_done(&c, hash, 32);
515-
COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_ptn_pow_2, sizeof(turbo_shake_128_ptn_pow_2), "TurboSHAKE128", counter++);
514+
LTC_COMPARE_TESTVECTOR(hash, 32, turbo_shake_128_ptn_pow_2, sizeof(turbo_shake_128_ptn_pow_2), "TurboSHAKE128", counter++);
516515

517516

518517
/* TurboSHAKE256 on an empty buffer */
519518
turbo_shake_init(&c, 256);
520519
turbo_shake_done(&c, hash, 64);
521-
COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_empty, sizeof(turbo_shake_256_empty), "TurboSHAKE256", counter++);
520+
LTC_COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_empty, sizeof(turbo_shake_256_empty), "TurboSHAKE256", counter++);
522521

523522
/* TurboSHAKE256 on an empty buffer, digest length 10032 bytes, test last 32 bytes */
524523
turbo_shake_init(&c, 256);
525524
for(i = 0; i != 10000 / 10; ++i){ turbo_shake_done(&c, hash, 10); }
526525
turbo_shake_done(&c, hash, 32);
527-
COMPARE_TESTVECTOR(hash, 32, turbo_shake_256_empty_10032, sizeof(turbo_shake_256_empty_10032), "TurboSHAKE256", counter++);
526+
LTC_COMPARE_TESTVECTOR(hash, 32, turbo_shake_256_empty_10032, sizeof(turbo_shake_256_empty_10032), "TurboSHAKE256", counter++);
528527

529528
/* TurboSHAKE256 on single zero byte */
530529
turbo_shake_init(&c, 256);
531530
turbo_shake_process(&c, turbo_shake_input_single_zero, sizeof(turbo_shake_input_single_zero));
532531
turbo_shake_done(&c, hash, 64);
533-
COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_single_zero_byte, sizeof(turbo_shake_256_single_zero_byte), "TurboSHAKE256", counter++);
532+
LTC_COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_single_zero_byte, sizeof(turbo_shake_256_single_zero_byte), "TurboSHAKE256", counter++);
534533

535534
/* TurboSHAKE256 on ptn(17**1) */
536535
turbo_shake_init(&c, 256);
537536
turbo_shake_process(&c, turbo_shake_input_ptn_17_pow_1, sizeof(turbo_shake_input_ptn_17_pow_1));
538537
turbo_shake_done(&c, hash, 64);
539-
COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_ptn_pow_1, sizeof(turbo_shake_256_ptn_pow_1), "TurboSHAKE256", counter++);
538+
LTC_COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_ptn_pow_1, sizeof(turbo_shake_256_ptn_pow_1), "TurboSHAKE256", counter++);
540539

541540
/* TurboSHAKE256 on ptn(17**2) */
542541
turbo_shake_init(&c, 256);
543542
turbo_shake_process(&c, turbo_shake_input_ptn_17_pow_2, sizeof(turbo_shake_input_ptn_17_pow_2));
544543
turbo_shake_done(&c, hash, 64);
545-
COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_ptn_pow_2, sizeof(turbo_shake_256_ptn_pow_2), "TurboSHAKE256", counter++);
544+
LTC_COMPARE_TESTVECTOR(hash, 64, turbo_shake_256_ptn_pow_2, sizeof(turbo_shake_256_ptn_pow_2), "TurboSHAKE256", counter++);
546545

547546
return CRYPT_OK;
548547
#endif

0 commit comments

Comments
 (0)