Commit 4833caed authored by Pauli's avatar Pauli Committed by Richard Levitte
Browse files

Remove fprintfs from the poly1305 internal test but keep the test number 


information.

The framework will display the non-matching memory.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3156)
parent ee25dd45

test/poly1305_internal_test.c

+5 −34
Original line number Diff line number Diff line
@@ -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",

                TEST_info("Poly1305 test #%d/%" OSSLzu "+%" OSSLzu " failed.",

                          idx, half, inlen-half);

                fprintf(stderr, "got:      ");

                hexdump(out, sizeof(out));

                fprintf(stderr, "\nexpected: ");

                hexdump(expected, expectedlen);

                fprintf(stderr, "\n");

                return 0;

            }

        }