Backout revision b33b017eede5, bug 1432144, r=franziskus

sailfishos-mirror · Feb 27, 2018 · ecfa56e · ecfa56e
1 parent 87f6d27
commit ecfa56e
Show file tree

Hide file tree

Showing 16 changed files with 209 additions and 211 deletions.
diff --git a/gtests/ssl_gtest/ssl_0rtt_unittest.cc b/gtests/ssl_gtest/ssl_0rtt_unittest.cc
@@ -518,7 +518,7 @@ TEST_P(TlsConnectTls13, SendTooMuchEarlyData) {
 TEST_P(TlsConnectTls13, ReceiveTooMuchEarlyData) {
   EnsureTlsSetup();
 
-  size_t limit = 5;
+  const size_t limit = 5;
   EXPECT_EQ(SECSuccess, SSL_SetMaxEarlyDataSize(server_->ssl_fd(), limit));
   SetupForZeroRtt();
 
@@ -548,9 +548,6 @@ TEST_P(TlsConnectTls13, ReceiveTooMuchEarlyData) {
   server_->Handshake();  // This reads the early data and maybe throws an error.
   if (variant_ == ssl_variant_stream) {
     server_->CheckErrorCode(SSL_ERROR_TOO_MUCH_EARLY_DATA);
-    // We drop the SID when sending the alert such that max_early_data_size is 0
-    // here.
-    limit = 0;
   } else {
     EXPECT_EQ(TlsAgent::STATE_CONNECTING, server_->state());
   }

diff --git a/gtests/ssl_gtest/ssl_loopback_unittest.cc b/gtests/ssl_gtest/ssl_loopback_unittest.cc
@@ -532,11 +532,6 @@ INSTANTIATE_TEST_CASE_P(
                        TlsConnectTestBase::kTlsV11V12));
 INSTANTIATE_TEST_CASE_P(Pre13StreamOnly, TlsConnectStreamPre13,
                         TlsConnectTestBase::kTlsV10ToV12);
-INSTANTIATE_TEST_CASE_P(
-    Pre13Stream, TlsConnectStreamResumptionPre13,
-    ::testing::Combine(TlsConnectTestBase::kTlsVariantsStream,
-                       TlsConnectTestBase::kTlsV10ToV12,
-                       ::testing::Values(true, false)));
 
 INSTANTIATE_TEST_CASE_P(Version12Plus, TlsConnectTls12Plus,
                         ::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,

diff --git a/gtests/ssl_gtest/ssl_resumption_unittest.cc b/gtests/ssl_gtest/ssl_resumption_unittest.cc
@@ -1028,27 +1028,4 @@ TEST_P(TlsConnectGenericResumption, ConnectResumeClientAuth) {
   SendReceive();
 }
 
-// Renegotiate a resumed session.
-TEST_P(TlsConnectStreamResumptionPre13, ConnectResumeRenegotiateClient) {
-  ConfigureSessionCache(RESUME_BOTH, RESUME_BOTH);
-  Connect();
-  SendReceive();
-
-  Reset();
-  ConfigureSessionCache(RESUME_BOTH, RESUME_BOTH);
-  ExpectResumption(RESUME_TICKET);
-  Connect();
-
-  // Disable resumption and prepare for renegotiation.
-  server_->ExpectResumption(false);
-  server_->PrepareForRenegotiate();
-  client_->ExpectResumption(false);
-  client_->StartRenegotiate();
-  Handshake();
-  // Don't CheckConnected its logic doesn't work in this case.
-  // It assumes a certain number of SIDs, resumed sessions, and cache
-  // hits/misses.
-  SendReceive();
-}
-
 }  // namespace nss_test
diff --git a/gtests/ssl_gtest/tls_agent.cc b/gtests/ssl_gtest/tls_agent.cc
@@ -589,9 +589,7 @@ void TlsAgent::EnableFalseStart() {
   SetOption(SSL_ENABLE_FALSE_START, PR_TRUE);
 }
 
-void TlsAgent::ExpectResumption(bool expected) {
-  expect_resumption_ = expected;
-}
+void TlsAgent::ExpectResumption() { expect_resumption_ = true; }
 
 void TlsAgent::EnableAlpn(const uint8_t* val, size_t len) {
   EXPECT_TRUE(EnsureTlsSetup());

diff --git a/gtests/ssl_gtest/tls_agent.h b/gtests/ssl_gtest/tls_agent.h
@@ -129,7 +129,7 @@ class TlsAgent : public PollTarget {
   void SetServerKeyBits(uint16_t bits);
   void ExpectReadWriteError();
   void EnableFalseStart();
-  void ExpectResumption(bool expected = true);
+  void ExpectResumption();
   void SkipVersionChecks();
   void SetSignatureSchemes(const SSLSignatureScheme* schemes, size_t count);
   void EnableAlpn(const uint8_t* val, size_t len);

diff --git a/gtests/ssl_gtest/tls_connect.h b/gtests/ssl_gtest/tls_connect.h
@@ -313,7 +313,6 @@ class TlsConnectDatagramPre13 : public TlsConnectDatagram {
 
 // A variant that is used only with Pre13.
 class TlsConnectGenericPre13 : public TlsConnectGeneric {};
-class TlsConnectStreamResumptionPre13 : public TlsConnectGenericResumption {};
 
 class TlsKeyExchangeTest : public TlsConnectGeneric {
  protected: