Add missing tests

Accidentally omitted from commit 455b65dfab0de51c9f67b3c909311770f2b3f801

Reviewed-by: Kurt Roeckx <kurt@openssl.org>

diff --git a/crypto/constant_time_test.c b/crypto/constant_time_test.c
index 1b4b18d1990e6ae6ab1976ea26109741514e86d4..d9c6a44aed055d46091e944205627c55bc2fdb88 100644 (file)
--- a/crypto/constant_time_test.c
+++ b/crypto/constant_time_test.c
@@ -201,14 +201,14 @@ static int test_eq_int(int a, int b)
        unsigned int equal = constant_time_eq_int(a, b);
        if (a == b && equal != CONSTTIME_TRUE)
                {
        unsigned int equal = constant_time_eq_int(a, b);
        if (a == b && equal != CONSTTIME_TRUE)
                {

-               fprintf(stderr, "Test failed for constant_time_select(%d, %d): "
+               fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): "

                        "expected %du(TRUE), got %du\n",
                        a, b, CONSTTIME_TRUE, equal);
                return 1;
                }
        else if (a != b && equal != CONSTTIME_FALSE)
                {
                        "expected %du(TRUE), got %du\n",
                        a, b, CONSTTIME_TRUE, equal);
                return 1;
                }
        else if (a != b && equal != CONSTTIME_FALSE)
                {

-               fprintf(stderr, "Test failed for constant_time_select(%d, %d): "
+               fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): "

                        "expected %du(FALSE), got %du\n",
                        a, b, CONSTTIME_FALSE, equal);
                return 1;
                        "expected %du(FALSE), got %du\n",
                        a, b, CONSTTIME_FALSE, equal);
                return 1;


@@ -221,14 +221,14 @@ static int test_eq_int_8(int a, int b)
        unsigned char equal = constant_time_eq_int_8(a, b);
        if (a == b && equal != CONSTTIME_TRUE_8)
                {
        unsigned char equal = constant_time_eq_int_8(a, b);
        if (a == b && equal != CONSTTIME_TRUE_8)
                {

-               fprintf(stderr, "Test failed for constant_time_select(%d, %d): "
+               fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): "

                        "expected %u(TRUE), got %u\n",
                        a, b, CONSTTIME_TRUE_8, equal);
                return 1;
                }
        else if (a != b && equal != CONSTTIME_FALSE_8)
                {
                        "expected %u(TRUE), got %u\n",
                        a, b, CONSTTIME_TRUE_8, equal);
                return 1;
                }
        else if (a != b && equal != CONSTTIME_FALSE_8)
                {

-               fprintf(stderr, "Test failed for constant_time_select(%d, %d): "
+               fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): "

                        "expected %u(FALSE), got %u\n",
                        a, b, CONSTTIME_FALSE_8, equal);
                return 1;
                        "expected %u(FALSE), got %u\n",
                        a, b, CONSTTIME_FALSE_8, equal);
                return 1;


@@ -300,7 +300,9 @@ int main(int argc, char *argv[])
                        {
                        d = signed_test_values[j];
                        num_failed += test_select_int(c, d);
                        {
                        d = signed_test_values[j];
                        num_failed += test_select_int(c, d);

-                       num_all += 1;
+                       num_failed += test_eq_int(c, d);
+                       num_failed += test_eq_int_8(c, d);
+                       num_all += 3;

                        }
                }
 
                        }
                }