summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 15:25:15 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 15:25:15 +0000
commite3eb8f843227bee3048589745e3bb1231a4248c7 (patch)
tree499ac656317738dffb2861a7b28ce63b5d370bbe /third_party
parenta25ea3ead3247589f6dabaa1b7a88aab10efabdd (diff)
downloadchromium_src-e3eb8f843227bee3048589745e3bb1231a4248c7.zip
chromium_src-e3eb8f843227bee3048589745e3bb1231a4248c7.tar.gz
chromium_src-e3eb8f843227bee3048589745e3bb1231a4248c7.tar.bz2
Revert "net: add test for False Start corking."
This reverts commit r60056. The test failed on Windows. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/tlslite/README.chromium4
-rw-r--r--third_party/tlslite/patches/false_start_corking.patch27
-rw-r--r--third_party/tlslite/tlslite/TLSRecordLayer.py9
3 files changed, 0 insertions, 40 deletions
diff --git a/third_party/tlslite/README.chromium b/third_party/tlslite/README.chromium
index c9b8845..3fc9665 100644
--- a/third_party/tlslite/README.chromium
+++ b/third_party/tlslite/README.chromium
@@ -25,7 +25,3 @@ Local Modifications:
default to a certificate_types of [rsa_sign] in CertificateRequest. Apple's
Secure Transport library rejects an empty list and raises an SSL protocol
error.
-- patches/false_start_corking.patch: tlslite/TLSRecordLayer.py was changed to
- report if data was pending on the socket when a Finished handshake message is
- processed. This allows us to test that our SSL client sockets are corking
- False Start application data correctly.
diff --git a/third_party/tlslite/patches/false_start_corking.patch b/third_party/tlslite/patches/false_start_corking.patch
deleted file mode 100644
index feebe34..0000000
--- a/third_party/tlslite/patches/false_start_corking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/tlslite/TLSRecordLayer.py b/tlslite/TLSRecordLayer.py
-index 1bbd09d..44cd33e 100644
---- a/tlslite/TLSRecordLayer.py
-+++ b/tlslite/TLSRecordLayer.py
-@@ -161,6 +161,10 @@ class TLSRecordLayer:
- #Fault we will induce, for testing purposes
- self.fault = None
-
-+ # Set to true if we observe a corked False Start (i.e., there's a
-+ # record pending when we read the Finished.)
-+ self.corkedFalseStart = False
-+
- #*********************************************************
- # Public Functions START
- #*********************************************************
-@@ -713,6 +717,11 @@ class TLSRecordLayer:
- yield ClientKeyExchange(constructorType, \
- self.version).parse(p)
- elif subType == HandshakeType.finished:
-+ try:
-+ m = self.sock.recv(1, socket.MSG_PEEK | socket.MSG_DONTWAIT)
-+ self.corkedFalseStart = len(m) == 1
-+ except:
-+ pass
- yield Finished(self.version).parse(p)
- else:
- raise AssertionError()
diff --git a/third_party/tlslite/tlslite/TLSRecordLayer.py b/third_party/tlslite/tlslite/TLSRecordLayer.py
index 44cd33e..1bbd09d 100644
--- a/third_party/tlslite/tlslite/TLSRecordLayer.py
+++ b/third_party/tlslite/tlslite/TLSRecordLayer.py
@@ -161,10 +161,6 @@ class TLSRecordLayer:
#Fault we will induce, for testing purposes
self.fault = None
- # Set to true if we observe a corked False Start (i.e., there's a
- # record pending when we read the Finished.)
- self.corkedFalseStart = False
-
#*********************************************************
# Public Functions START
#*********************************************************
@@ -717,11 +713,6 @@ class TLSRecordLayer:
yield ClientKeyExchange(constructorType, \
self.version).parse(p)
elif subType == HandshakeType.finished:
- try:
- m = self.sock.recv(1, socket.MSG_PEEK | socket.MSG_DONTWAIT)
- self.corkedFalseStart = len(m) == 1
- except:
- pass
yield Finished(self.version).parse(p)
else:
raise AssertionError()