third_party/tlslite/patches/ssl3_padding.patch - Issue 210323002: Update tlslite to 0.4.6.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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:

OLD	NEW
(Empty)
	1 diff --git a/third_party/tlslite/tlslite/tlsrecordlayer.py b/third_party/tlslite /tlslite/tlsrecordlayer.py

	2 index ff08cbf..fb85224 100755

	3 --- a/third_party/tlslite/tlslite/tlsrecordlayer.py

	4 +++ b/third_party/tlslite/tlslite/tlsrecordlayer.py

	5 @@ -590,6 +590,9 @@ class TLSRecordLayer(object):

	6 currentLength = len(b) + len(macBytes) + 1

	7 blockLength = self._writeState.encContext.block_size

	8 paddingLength = blockLength-(currentLength % blockLength)

	9 + #SSL3 requires minimal padding. (TLS doesn't care.)

	10 + if paddingLength == blockLength:

	11 + paddingLength = 0
	wtc 2014/04/08 22:29:09 This is how NSS does it: currentLength = len( This is how NSS does it: currentLength = len(b) + len(macBytes) blockLength = self._writeState.encContext.block_size paddingLength = blockLength-1-(currentLength % blockLength) This code replaces lines 6-11. davidben 2014/04/08 23:30:36 Oh, that's much tidier. Done. Show quoted text On 2014/04/08 22:29:09, wtc wrote: > > This is how NSS does it: > > currentLength = len(b) + len(macBytes) > blockLength = self._writeState.encContext.block_size > paddingLength = blockLength-1-(currentLength % blockLength) > > This code replaces lines 6-11. Oh, that's much tidier. Done.
	12

	13 paddingBytes = bytearray([paddingLength] * (paddingLength+1))

	14 if self.fault == Fault.badPadding:

OLD	NEW