net/third_party/nss/patches/paddingextensionall.patch - Issue 142283002: Update net/third_party/nss to NSS_3_15_5_BETA2.

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: net/third_party/nss/patches/paddingextensionall.patch

Issue 142283002: Update net/third_party/nss to NSS_3_15_5_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Fix applypatches.sh mistakes Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 diff -pu a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c	1 diff -pu a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c

2 --- a/nss/lib/ssl/ssl3ext.c» 2014-01-03 19:03:55.557150476 -0800	2 --- a/nss/lib/ssl/ssl3ext.c» 2014-01-17 17:59:03.242109996 -0800

3 +++ b/nss/lib/ssl/ssl3ext.c» 2014-01-03 19:04:04.597298171 -0800	3 +++ b/nss/lib/ssl/ssl3ext.c» 2014-01-17 18:17:39.630620563 -0800

4 @@ -2324,7 +2324,11 @@ ssl3_CalculatePaddingExtensionLength(uns	4 @@ -2332,7 +2332,11 @@ ssl3_CalculatePaddingExtensionLength(uns

5 clientHelloLength;	5 clientHelloLength;

6 unsigned int extensionLength;	6 unsigned int extensionLength;

7	7

8 - if (recordLength < 256 \|\| recordLength >= 512) {	8 - if (recordLength < 256 \|\| recordLength >= 512) {

9 + /* This condition should be:	9 + /* This condition should be:

10 + * if (recordLength < 256 \|\| recordLength >= 512) {	10 + * if (recordLength < 256 \|\| recordLength >= 512) {

11 + * It has been changed, temporarily, to test whether 512 byte ClientHellos	11 + * It has been changed, temporarily, to test whether 512 byte ClientHellos

12 + * are a compatibility problem. */	12 + * are a compatibility problem. */

13 + if (recordLength >= 512) {	13 + if (recordLength >= 512) {

14 return 0;	14 return 0;

15 }	15 }

16	16

17 @@ -2345,7 +2349,7 @@ ssl3_AppendPaddingExtension(sslSocket *s	17 @@ -2353,7 +2357,7 @@ ssl3_AppendPaddingExtension(sslSocket *s

18 PRUint32 maxBytes)	18 PRUint32 maxBytes)

19 {	19 {

20 unsigned int paddingLen = extensionLen - 4;	20 unsigned int paddingLen = extensionLen - 4;

21 - unsigned char padding[256];	21 - static unsigned char padding[256];

22 + unsigned char padding[512];	22 + static unsigned char padding[512];

23	23

24 if (extensionLen == 0) {	24 if (extensionLen == 0) {

25 return 0;	25 return 0;

OLD	NEW

« no previous file with comments | « net/third_party/nss/patches/paddingextension.patch ('k') | net/third_party/nss/patches/restartclientauth.patch » ('j') | net/third_party/nss/ssl/ssl.h » ('J')