|
 |
5f43a7 |
diff -up ./gtests/softoken_gtest/softoken_gtest.cc.remove_timing_test ./gtests/softoken_gtest/softoken_gtest.cc
|
|
|
5f43a7 |
--- ./gtests/softoken_gtest/softoken_gtest.cc.remove_timing_test 2020-07-30 08:34:30.404750663 -0700
|
|
|
5f43a7 |
+++ ./gtests/softoken_gtest/softoken_gtest.cc 2020-07-30 08:43:39.640495618 -0700
|
|
|
5f43a7 |
@@ -605,11 +605,14 @@ SECStatus test_dh_value(const PQGParams
|
|
|
5f43a7 |
class SoftokenDhTest : public SoftokenTest {
|
|
|
5f43a7 |
protected:
|
|
|
5f43a7 |
SoftokenDhTest() : SoftokenTest("SoftokenDhTest.d-") {}
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
time_t reference_time[CLASS_LAST] = {0};
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
|
|
|
5f43a7 |
virtual void SetUp() {
|
|
|
5f43a7 |
SoftokenTest::SetUp();
|
|
|
5f43a7 |
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
ScopedPK11SlotInfo slot(PK11_GetInternalSlot());
|
|
|
5f43a7 |
ASSERT_TRUE(slot);
|
|
|
5f43a7 |
|
|
|
5f43a7 |
@@ -625,6 +628,7 @@ class SoftokenDhTest : public SoftokenTe
|
|
|
5f43a7 |
ASSERT_EQ(SECSuccess, test_dh_value(¶ms, nullptr, PR_FALSE, &time);;
|
|
|
5f43a7 |
reference_time[i] = time + 2 * time;
|
|
|
5f43a7 |
}
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
};
|
|
|
5f43a7 |
};
|
|
|
5f43a7 |
|
|
|
5f43a7 |
@@ -708,12 +712,16 @@ TEST_P(SoftokenDhValidate, DhVectors) {
|
|
|
5f43a7 |
case SAFE_PRIME:
|
|
|
5f43a7 |
case UNKNOWN_SUBPRIME:
|
|
|
5f43a7 |
EXPECT_EQ(SECSuccess, rv) << err;
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
EXPECT_LE(time, reference_time[dhTestValues.key_class]) << err;
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
break;
|
|
|
5f43a7 |
case KNOWN_SUBPRIME:
|
|
|
5f43a7 |
case SAFE_PRIME_WITH_SUBPRIME:
|
|
|
5f43a7 |
EXPECT_EQ(SECSuccess, rv) << err;
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
EXPECT_GT(time, reference_time[dhTestValues.key_class]) << err;
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
break;
|
|
|
5f43a7 |
case WRONG_SUBPRIME:
|
|
|
5f43a7 |
case BAD_PUB_KEY:
|
|
|
5f43a7 |
@@ -749,7 +757,9 @@ class SoftokenFipsTest : public Softoken
|
|
|
5f43a7 |
class SoftokenFipsDhTest : public SoftokenFipsTest {
|
|
|
5f43a7 |
protected:
|
|
|
5f43a7 |
SoftokenFipsDhTest() : SoftokenFipsTest("SoftokenFipsDhTest.d-") {}
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
time_t reference_time[CLASS_LAST] = {0};
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
|
|
|
5f43a7 |
virtual void SetUp() {
|
|
|
5f43a7 |
SoftokenFipsTest::SetUp();
|
|
|
5f43a7 |
@@ -760,6 +770,7 @@ class SoftokenFipsDhTest : public Softok
|
|
|
5f43a7 |
ASSERT_EQ(SECSuccess, PK11_InitPin(slot.get(), nullptr, ""));
|
|
|
5f43a7 |
ASSERT_EQ(SECSuccess, PK11_Authenticate(slot.get(), PR_FALSE, nullptr));
|
|
|
5f43a7 |
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
time_t time;
|
|
|
5f43a7 |
for (int i = CLASS_FIRST; i < CLASS_LAST; i++) {
|
|
|
5f43a7 |
PQGParams params;
|
|
|
5f43a7 |
@@ -772,6 +783,7 @@ class SoftokenFipsDhTest : public Softok
|
|
|
5f43a7 |
ASSERT_EQ(SECSuccess, test_dh_value(¶ms, nullptr, PR_FALSE, &time);;
|
|
|
5f43a7 |
reference_time[i] = time + 2 * time;
|
|
|
5f43a7 |
}
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
};
|
|
|
5f43a7 |
};
|
|
|
5f43a7 |
|
|
|
5f43a7 |
@@ -883,7 +895,9 @@ TEST_P(SoftokenFipsDhValidate, DhVectors
|
|
|
5f43a7 |
case TLS_APPROVED:
|
|
|
5f43a7 |
case IKE_APPROVED:
|
|
|
5f43a7 |
EXPECT_EQ(SECSuccess, rv) << err;
|
|
|
5f43a7 |
+#ifdef NSS_USE_REFERENCE_TIME
|
|
|
5f43a7 |
EXPECT_LE(time, reference_time[dhTestValues.key_class]) << err;
|
|
|
5f43a7 |
+#endif
|
|
|
5f43a7 |
break;
|
|
|
5f43a7 |
case SAFE_PRIME:
|
|
|
5f43a7 |
case SAFE_PRIME_WITH_SUBPRIME:
|