Revert "Update NSS to 3.35-RTM"

This reverts commit f1a0f0a56fdd0fc39f255174ce08c06b91c66c94.

1 files changed, 2 insertions, 71 deletions

diff --git a/security/nss/gtests/ssl_gtest/ssl_record_unittest.cc b/security/nss/gtests/ssl_gtest/ssl_record_unittest.cc
index d1d496f49..ef81b222c 100644
--- a/security/nss/gtests/ssl_gtest/ssl_record_unittest.cc
+++ b/security/nss/gtests/ssl_gtest/ssl_record_unittest.cc
@@ -10,8 +10,6 @@
 
 #include "databuffer.h"
 #include "gtest_utils.h"
-#include "tls_connect.h"
-#include "tls_filter.h"
 
 namespace nss_test {
 
@@ -53,8 +51,8 @@ class TlsPaddingTest
               << " total length=" << plaintext_.len() << std::endl;
     std::cerr << "Plaintext: " << plaintext_ << std::endl;
     sslBuffer s;
-    s.buf = const_cast<unsigned char*>(
-        static_cast<const unsigned char*>(plaintext_.data()));
+    s.buf = const_cast<unsigned char *>(
+        static_cast<const unsigned char *>(plaintext_.data()));
     s.len = plaintext_.len();
     SECStatus rv = ssl_RemoveTLSCBCPadding(&s, kMacSize);
     if (expect_success) {
@@ -101,73 +99,6 @@ TEST_P(TlsPaddingTest, LastByteOfPadWrong) {
   }
 }
 
-class RecordReplacer : public TlsRecordFilter {
- public:
-  RecordReplacer(size_t size)
-      : TlsRecordFilter(), enabled_(false), size_(size) {}
-
-  PacketFilter::Action FilterRecord(const TlsRecordHeader& header,
-                                    const DataBuffer& data,
-                                    DataBuffer* changed) override {
-    if (!enabled_) {
-      return KEEP;
-    }
-
-    EXPECT_EQ(kTlsApplicationDataType, header.content_type());
-    changed->Allocate(size_);
-
-    for (size_t i = 0; i < size_; ++i) {
-      changed->data()[i] = i & 0xff;
-    }
-
-    enabled_ = false;
-    return CHANGE;
-  }
-
-  void Enable() { enabled_ = true; }
-
- private:
-  bool enabled_;
-  size_t size_;
-};
-
-TEST_F(TlsConnectStreamTls13, LargeRecord) {
-  EnsureTlsSetup();
-
-  const size_t record_limit = 16384;
-  auto replacer = std::make_shared<RecordReplacer>(record_limit);
-  client_->SetTlsRecordFilter(replacer);
-  Connect();
-
-  replacer->Enable();
-  client_->SendData(10);
-  WAIT_(server_->received_bytes() == record_limit, 2000);
-  ASSERT_EQ(record_limit, server_->received_bytes());
-}
-
-TEST_F(TlsConnectStreamTls13, TooLargeRecord) {
-  EnsureTlsSetup();
-
-  const size_t record_limit = 16384;
-  auto replacer = std::make_shared<RecordReplacer>(record_limit + 1);
-  client_->SetTlsRecordFilter(replacer);
-  Connect();
-
-  replacer->Enable();
-  ExpectAlert(server_, kTlsAlertRecordOverflow);
-  client_->SendData(10);  // This is expanded.
-
-  uint8_t buf[record_limit + 2];
-  PRInt32 rv = PR_Read(server_->ssl_fd(), buf, sizeof(buf));
-  EXPECT_GT(0, rv);
-  EXPECT_EQ(SSL_ERROR_RX_RECORD_TOO_LONG, PORT_GetError());
-
-  // Read the server alert.
-  rv = PR_Read(client_->ssl_fd(), buf, sizeof(buf));
-  EXPECT_GT(0, rv);
-  EXPECT_EQ(SSL_ERROR_RECORD_OVERFLOW_ALERT, PORT_GetError());
-}
-
 const static size_t kContentSizesArr[] = {
     1, kMacSize - 1, kMacSize, 30, 31, 32, 36, 256, 257, 287, 288};