Convert constant_time_test to GTest.
This ends up under half the size of the original file.
BUG=129
Change-Id: Idec69d9517bd57cee6b3b83bc0cce05396565b70
Reviewed-on: https://boringssl-review.googlesource.com/14305
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index dbc09fd..3728e6f 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -177,17 +177,6 @@
endif()
add_executable(
- constant_time_test
-
- constant_time_test.cc
-
- $<TARGET_OBJECTS:test_support>
-)
-
-target_link_libraries(constant_time_test crypto)
-add_dependencies(all_tests constant_time_test)
-
-add_executable(
thread_test
thread_test.c
@@ -214,6 +203,7 @@
asn1/asn1_test.cc
bio/bio_test.cc
chacha/chacha_test.cc
+ constant_time_test.cc
curve25519/x25519_test.cc
dh/dh_test.cc
dsa/dsa_test.cc
diff --git a/crypto/constant_time_test.cc b/crypto/constant_time_test.cc
index bc127c1..adfe272 100644
--- a/crypto/constant_time_test.cc
+++ b/crypto/constant_time_test.cc
@@ -49,183 +49,34 @@
#include <stdio.h>
#include <stdlib.h>
+#include <gtest/gtest.h>
-static const unsigned int CONSTTIME_TRUE = (unsigned)(~0);
-static const unsigned int CONSTTIME_FALSE = 0;
+
+static const unsigned CONSTTIME_TRUE = (unsigned)(~0);
+static const unsigned CONSTTIME_FALSE = 0;
static const uint8_t CONSTTIME_TRUE_8 = 0xff;
static const uint8_t CONSTTIME_FALSE_8 = 0;
-static int test_binary_op(unsigned int (*op)(unsigned int a, unsigned int b),
- const char* op_name, unsigned int a, unsigned int b,
- int is_true) {
- unsigned c = op(a, b);
- if (is_true && c != CONSTTIME_TRUE) {
- fprintf(stderr,
- "Test failed for %s(%du, %du): expected %du (TRUE), got %du\n",
- op_name, a, b, CONSTTIME_TRUE, c);
- return 1;
- } else if (!is_true && c != CONSTTIME_FALSE) {
- fprintf(stderr,
- "Test failed for %s(%du, %du): expected %du (FALSE), got %du\n",
- op_name, a, b, CONSTTIME_FALSE, c);
- return 1;
- }
- return 0;
+static unsigned FromBool(bool b) {
+ return b ? CONSTTIME_TRUE : CONSTTIME_FALSE;
}
-static int test_binary_op_8(uint8_t (*op)(unsigned int a, unsigned int b),
- const char* op_name, unsigned int a, unsigned int b,
- int is_true) {
- uint8_t c = op(a, b);
- if (is_true && c != CONSTTIME_TRUE_8) {
- fprintf(stderr,
- "Test failed for %s(%du, %du): expected %u (TRUE), got %u\n",
- op_name, a, b, CONSTTIME_TRUE_8, c);
- return 1;
- } else if (!is_true && c != CONSTTIME_FALSE_8) {
- fprintf(stderr,
- "Test failed for %s(%du, %du): expected %u (FALSE), got %u\n",
- op_name, a, b, CONSTTIME_FALSE_8, c);
- return 1;
- }
- return 0;
+static uint8_t FromBool8(bool b) {
+ return b ? CONSTTIME_TRUE_8 : CONSTTIME_FALSE_8;
}
-static int test_is_zero(unsigned int a) {
- unsigned int c = constant_time_is_zero(a);
- if (a == 0 && c != CONSTTIME_TRUE) {
- fprintf(stderr,
- "Test failed for constant_time_is_zero(%du): expected %du (TRUE), "
- "got %du\n",
- a, CONSTTIME_TRUE, c);
- return 1;
- } else if (a != 0 && c != CONSTTIME_FALSE) {
- fprintf(stderr,
- "Test failed for constant_time_is_zero(%du): expected %du (FALSE), "
- "got %du\n",
- a, CONSTTIME_FALSE, c);
- return 1;
- }
- return 0;
-}
-
-static int test_is_zero_8(unsigned int a) {
- uint8_t c = constant_time_is_zero_8(a);
- if (a == 0 && c != CONSTTIME_TRUE_8) {
- fprintf(stderr,
- "Test failed for constant_time_is_zero(%du): expected %u (TRUE), "
- "got %u\n",
- a, CONSTTIME_TRUE_8, c);
- return 1;
- } else if (a != 0 && c != CONSTTIME_FALSE) {
- fprintf(stderr,
- "Test failed for constant_time_is_zero(%du): expected %u (FALSE), "
- "got %u\n",
- a, CONSTTIME_FALSE_8, c);
- return 1;
- }
- return 0;
-}
-
-static int test_select(unsigned int a, unsigned int b) {
- unsigned int selected = constant_time_select(CONSTTIME_TRUE, a, b);
- if (selected != a) {
- fprintf(stderr,
- "Test failed for constant_time_select(%du, %du,"
- "%du): expected %du(first value), got %du\n",
- CONSTTIME_TRUE, a, b, a, selected);
- return 1;
- }
- selected = constant_time_select(CONSTTIME_FALSE, a, b);
- if (selected != b) {
- fprintf(stderr,
- "Test failed for constant_time_select(%du, %du,"
- "%du): expected %du(second value), got %du\n",
- CONSTTIME_FALSE, a, b, b, selected);
- return 1;
- }
- return 0;
-}
-
-static int test_select_8(uint8_t a, uint8_t b) {
- uint8_t selected = constant_time_select_8(CONSTTIME_TRUE_8, a, b);
- if (selected != a) {
- fprintf(stderr,
- "Test failed for constant_time_select(%u, %u,"
- "%u): expected %u(first value), got %u\n",
- CONSTTIME_TRUE, a, b, a, selected);
- return 1;
- }
- selected = constant_time_select_8(CONSTTIME_FALSE_8, a, b);
- if (selected != b) {
- fprintf(stderr,
- "Test failed for constant_time_select(%u, %u,"
- "%u): expected %u(second value), got %u\n",
- CONSTTIME_FALSE, a, b, b, selected);
- return 1;
- }
- return 0;
-}
-
-static int test_select_int(int a, int b) {
- int selected = constant_time_select_int(CONSTTIME_TRUE, a, b);
- if (selected != a) {
- fprintf(stderr,
- "Test failed for constant_time_select(%du, %d,"
- "%d): expected %d(first value), got %d\n",
- CONSTTIME_TRUE, a, b, a, selected);
- return 1;
- }
- selected = constant_time_select_int(CONSTTIME_FALSE, a, b);
- if (selected != b) {
- fprintf(stderr,
- "Test failed for constant_time_select(%du, %d,"
- "%d): expected %d(second value), got %d\n",
- CONSTTIME_FALSE, a, b, b, selected);
- return 1;
- }
- return 0;
-}
-
-static int test_eq_int(int a, int b) {
- unsigned int equal = constant_time_eq_int(a, b);
- if (a == b && equal != CONSTTIME_TRUE) {
- 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) {
- fprintf(stderr,
- "Test failed for constant_time_eq_int(%d, %d): expected "
- "%du(FALSE), got %du\n",
- a, b, CONSTTIME_FALSE, equal);
- return 1;
- }
- return 0;
-}
-
-static int test_eq_int_8(int a, int b) {
- uint8_t equal = constant_time_eq_int_8(a, b);
- if (a == b && equal != CONSTTIME_TRUE_8) {
- 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) {
- 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;
- }
- return 0;
-}
-
-static unsigned int test_values[] = {0, 1, 1024, 12345, 32000, UINT_MAX / 2 - 1,
- UINT_MAX / 2, UINT_MAX / 2 + 1,
- UINT_MAX - 1, UINT_MAX};
+static unsigned test_values[] = {
+ 0,
+ 1,
+ 1024,
+ 12345,
+ 32000,
+ UINT_MAX / 2 - 1,
+ UINT_MAX / 2,
+ UINT_MAX / 2 + 1,
+ UINT_MAX - 1,
+ UINT_MAX,
+};
static uint8_t test_values_8[] = {0, 1, 2, 20, 32, 127, 128, 129, 255};
@@ -233,75 +84,49 @@
0, 1, -1, 1024, -1024, 12345, -12345,
32000, -32000, INT_MAX, INT_MIN, INT_MAX - 1, INT_MIN + 1};
-int main(int argc, char* argv[]) {
- unsigned int a, b, i, j;
- int c, d;
- uint8_t e, f;
- int num_failed = 0, num_all = 0;
- fprintf(stdout, "Testing constant time operations...\n");
+TEST(ConstantTimeTest, Test) {
+ for (unsigned a : test_values) {
+ SCOPED_TRACE(a);
- for (i = 0; i < sizeof(test_values) / sizeof(int); ++i) {
- a = test_values[i];
- num_failed += test_is_zero(a);
- num_failed += test_is_zero_8(a);
- num_all += 2;
- for (j = 0; j < sizeof(test_values) / sizeof(int); ++j) {
- b = test_values[j];
- num_failed +=
- test_binary_op(&constant_time_lt, "constant_time_lt", a, b, a < b);
- num_failed += test_binary_op_8(&constant_time_lt_8, "constant_time_lt_8",
- a, b, a < b);
- num_failed +=
- test_binary_op(&constant_time_lt, "constant_time_lt_8", b, a, b < a);
- num_failed += test_binary_op_8(&constant_time_lt_8, "constant_time_lt_8",
- b, a, b < a);
- num_failed +=
- test_binary_op(&constant_time_ge, "constant_time_ge", a, b, a >= b);
- num_failed += test_binary_op_8(&constant_time_ge_8, "constant_time_ge_8",
- a, b, a >= b);
- num_failed +=
- test_binary_op(&constant_time_ge, "constant_time_ge", b, a, b >= a);
- num_failed += test_binary_op_8(&constant_time_ge_8, "constant_time_ge_8",
- b, a, b >= a);
- num_failed +=
- test_binary_op(&constant_time_eq, "constant_time_eq", a, b, a == b);
- num_failed += test_binary_op_8(&constant_time_eq_8, "constant_time_eq_8",
- a, b, a == b);
- num_failed +=
- test_binary_op(&constant_time_eq, "constant_time_eq", b, a, b == a);
- num_failed += test_binary_op_8(&constant_time_eq_8, "constant_time_eq_8",
- b, a, b == a);
- num_failed += test_select(a, b);
- num_all += 13;
+ EXPECT_EQ(FromBool(a == 0), constant_time_is_zero(a));
+ EXPECT_EQ(FromBool8(a == 0), constant_time_is_zero_8(a));
+
+ for (unsigned b : test_values) {
+ SCOPED_TRACE(b);
+
+ EXPECT_EQ(FromBool(a < b), constant_time_lt(a, b));
+ EXPECT_EQ(FromBool8(a < b), constant_time_lt_8(a, b));
+
+ EXPECT_EQ(FromBool(a >= b), constant_time_ge(a, b));
+ EXPECT_EQ(FromBool8(a >= b), constant_time_ge_8(a, b));
+
+ EXPECT_EQ(FromBool(a == b), constant_time_eq(a, b));
+ EXPECT_EQ(FromBool8(a == b), constant_time_eq_8(a, b));
+
+ EXPECT_EQ(a, constant_time_select(CONSTTIME_TRUE, a, b));
+ EXPECT_EQ(b, constant_time_select(CONSTTIME_FALSE, a, b));
}
}
- for (i = 0; i < sizeof(signed_test_values) / sizeof(int); ++i) {
- c = signed_test_values[i];
- for (j = 0; j < sizeof(signed_test_values) / sizeof(int); ++j) {
- d = signed_test_values[j];
- num_failed += test_select_int(c, d);
- num_failed += test_eq_int(c, d);
- num_failed += test_eq_int_8(c, d);
- num_all += 3;
+ for (int a : signed_test_values) {
+ SCOPED_TRACE(a);
+ for (int b : signed_test_values) {
+ SCOPED_TRACE(b);
+
+ EXPECT_EQ(a, constant_time_select_int(CONSTTIME_TRUE, a, b));
+ EXPECT_EQ(b, constant_time_select_int(CONSTTIME_FALSE, a, b));
+
+ EXPECT_EQ(FromBool(a == b), constant_time_eq_int(a, b));
+ EXPECT_EQ(FromBool8(a == b), constant_time_eq_int_8(a, b));
}
}
- for (i = 0; i < sizeof(test_values_8); ++i) {
- e = test_values_8[i];
- for (j = 0; j < sizeof(test_values_8); ++j) {
- f = test_values_8[j];
- num_failed += test_select_8(e, f);
- num_all += 1;
+ for (uint8_t a : test_values_8) {
+ SCOPED_TRACE(static_cast<int>(a));
+ for (uint8_t b : test_values_8) {
+ SCOPED_TRACE(static_cast<int>(b));
+ EXPECT_EQ(a, constant_time_select_8(CONSTTIME_TRUE_8, a, b));
+ EXPECT_EQ(b, constant_time_select_8(CONSTTIME_FALSE_8, a, b));
}
}
-
- if (!num_failed) {
- fprintf(stdout, "ok (ran %d tests)\n", num_all);
- fprintf(stdout, "PASS\n");
- return EXIT_SUCCESS;
- } else {
- fprintf(stdout, "%d of %d tests failed!\n", num_failed, num_all);
- return EXIT_FAILURE;
- }
}
diff --git a/util/all_tests.json b/util/all_tests.json
index c959e54..a1ce5f2 100644
--- a/util/all_tests.json
+++ b/util/all_tests.json
@@ -24,7 +24,6 @@
["crypto/cipher/aead_test", "aes-256-ctr-hmac-sha256", "crypto/cipher/test/aes_256_ctr_hmac_sha256.txt"],
["crypto/cipher/cipher_test", "crypto/cipher/test/cipher_tests.txt"],
["crypto/cmac/cmac_test"],
- ["crypto/constant_time_test"],
["crypto/crypto_test"],
["crypto/curve25519/ed25519_test", "crypto/curve25519/ed25519_tests.txt"],
["crypto/curve25519/spake25519_test"],
