Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: third_party/tlslite/patches/ssl3_padding.patch

Issue 210323002: Update tlslite to 0.4.6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rietveld, please behave Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tlslite/patches/ssl3_padding.patch
diff --git a/third_party/tlslite/patches/ssl3_padding.patch b/third_party/tlslite/patches/ssl3_padding.patch
new file mode 100644
index 0000000000000000000000000000000000000000..dbdb6421b17035fa8173f5110d3d93817bbb36fc
--- /dev/null
+++ b/third_party/tlslite/patches/ssl3_padding.patch
@@ -0,0 +1,14 @@
+diff --git a/third_party/tlslite/tlslite/tlsrecordlayer.py b/third_party/tlslite/tlslite/tlsrecordlayer.py
+index ff08cbf..fb85224 100755
+--- a/third_party/tlslite/tlslite/tlsrecordlayer.py
++++ b/third_party/tlslite/tlslite/tlsrecordlayer.py
+@@ -590,6 +590,9 @@ class TLSRecordLayer(object):
+ currentLength = len(b) + len(macBytes) + 1
+ blockLength = self._writeState.encContext.block_size
+ paddingLength = blockLength-(currentLength % blockLength)
++ #SSL3 requires minimal padding. (TLS doesn't care.)
++ if paddingLength == blockLength:
++ paddingLength = 0
wtc 2014/04/08 22:29:09 This is how NSS does it: currentLength = len(
davidben 2014/04/08 23:30:36 Oh, that's much tidier. Done.
+
+ paddingBytes = bytearray([paddingLength] * (paddingLength+1))
+ if self.fault == Fault.badPadding:

Powered by Google App Engine
This is Rietveld 408576698