diff options
| author | Pauli <paul.dale@oracle.com> | 2017-04-10 13:38:24 +1000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-04-12 13:37:12 +0200 |
| commit | 4833caed466ce8b7ae1d5fbafc23740885dbd9cc (patch) | |
| tree | 691a96994cbebe90470324dfe034ac6560da2fa4 | |
| parent | ee25dd45cb1dd7efa1af2574566ae04537907461 (diff) | |
Remove fprintfs from the poly1305 internal test but keep the test number
information.
The framework will display the non-matching memory.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3156)
| -rw-r--r-- | test/poly1305_internal_test.c | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c index af54ac3e6c..03b0fa91df 100644 --- a/test/poly1305_internal_test.c +++ b/test/poly1305_internal_test.c @@ -35,15 +35,6 @@ typedef struct { * ***/ -/* TODO : hex decoder / encoder should be implemented in testutil.c */ -static void hexdump(const unsigned char *a, size_t len) -{ - size_t i; - - for (i = 0; i < len; i++) - fprintf(stderr, "%02x", a[i]); -} - static void benchmark_poly1305() { # ifdef OPENSSL_CPUID_OBJ @@ -1573,12 +1564,7 @@ static int test_poly1305(int idx) Poly1305_Final(&poly1305, out); if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) { - fprintf(stderr, "Poly1305 test #%d failed.\n", idx); - fprintf(stderr, "got: "); - hexdump(out, sizeof(out)); - fprintf(stderr, "\nexpected: "); - hexdump(expected, expectedlen); - fprintf(stderr, "\n"); + TEST_info("Poly1305 test #%d failed.", idx); return 0; } @@ -1589,12 +1575,7 @@ static int test_poly1305(int idx) Poly1305_Final(&poly1305, out); if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) { - fprintf(stderr, "Poly1305 test #%d/1+(N-1) failed.\n", idx); - fprintf(stderr, "got: "); - hexdump(out, sizeof(out)); - fprintf(stderr, "\nexpected: "); - hexdump(expected, expectedlen); - fprintf(stderr, "\n"); + TEST_info("Poly1305 test #%d/1+(N-1) failed.", idx); return 0; } } @@ -1608,12 +1589,7 @@ static int test_poly1305(int idx) Poly1305_Final(&poly1305, out); if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) { - fprintf(stderr, "Poly1305 test #%d/2 failed.\n", idx); - fprintf(stderr, "got: "); - hexdump(out, sizeof(out)); - fprintf(stderr, "\nexpected: "); - hexdump(expected, expectedlen); - fprintf(stderr, "\n"); + TEST_info("Poly1305 test #%d/2 failed.", idx); return 0; } @@ -1624,13 +1600,8 @@ static int test_poly1305(int idx) Poly1305_Final(&poly1305, out); if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) { - fprintf(stderr, "Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.\n", - idx, half, inlen-half); - fprintf(stderr, "got: "); - hexdump(out, sizeof(out)); - fprintf(stderr, "\nexpected: "); - hexdump(expected, expectedlen); - fprintf(stderr, "\n"); + TEST_info("Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.", + idx, half, inlen-half); return 0; } } |