Bug 1287254 - Follow-up to fix ssl_gtests with NSS_ENABLE_TLS_1_3 und…

…efined r=mt
sailfishos-mirror · Jul 16, 2016 · b53ead8 · b53ead8
1 parent 49fef7e
commit b53ead8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/external_tests/ssl_gtest/Makefile b/external_tests/ssl_gtest/Makefile
@@ -47,3 +47,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
+
+ifndef NSS_ENABLE_TLS_1_3
+$(warning Not including ssl_0rtt_unittest.cc because TLS 1.3 is disabled)
+CPPSRCS := $(filter-out ssl_0rtt_unittest.cc, $(CPPSRCS))
+endif
diff --git a/external_tests/ssl_gtest/ssl_loopback_unittest.cc b/external_tests/ssl_gtest/ssl_loopback_unittest.cc
@@ -160,6 +160,7 @@ TEST_P(TlsConnectGeneric, ConnectWithCompressionMaybe)
   SendReceive();
 }
 
+#ifdef NSS_ENABLE_TLS_1_3
 TEST_F(TlsConnectTest, DamageSecretHandleClientFinished) {
   client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_1,
                            SSL_LIBRARY_VERSION_TLS_1_3);
@@ -196,6 +197,7 @@ TEST_F(TlsConnectTest, DamageSecretHandleServerFinished) {
   client_->CheckErrorCode(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE);
   server_->CheckErrorCode(SSL_ERROR_DECRYPT_ERROR_ALERT);
 }
+#endif
 
 TEST_P(TlsConnectDatagram, TestDtlsHolddownExpiry) {
   Connect();

diff --git a/external_tests/ssl_gtest/ssl_resumption_unittest.cc b/external_tests/ssl_gtest/ssl_resumption_unittest.cc
@@ -312,6 +312,7 @@ TEST_P(TlsConnectGenericPre13, ConnectEcdheTwiceNewKey) {
                         dhe1.public_key_.len())));
 }
 
+#ifdef NSS_ENABLE_TLS_1_3
 // Test that two TLS resumptions work and produce the same ticket.
 // This will change after bug 1257047 is fixed.
 TEST_F(TlsConnectTest, TestTls13ResumptionTwice) {
@@ -439,5 +440,6 @@ TEST_F(TlsConnectTest, DisableServerPSKAndFailToResume) {
   EXPECT_LT(0U, clientCapture->extension().len());
   EXPECT_EQ(0U, serverCapture->extension().len());
 }
+#endif
 
 }  // namespace nss_test