net/third_party/nss/patches/paddingextensionall.patch - Issue 111853013: Update net/third_party/nss to NSS 3.15.4.

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

Unified Diff: net/third_party/nss/patches/paddingextensionall.patch

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

Patch Set: Update the comment in sslenum.c for the two CHACHA20 cipher suites 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:

Index: net/third_party/nss/patches/paddingextensionall.patch

===================================================================

--- net/third_party/nss/patches/paddingextensionall.patch (revision 242942)

+++ net/third_party/nss/patches/paddingextensionall.patch (working copy)

@@ -1,8 +1,7 @@

-diff --git a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c

-index cdebcc9..03cf05c 100644

---- a/nss/lib/ssl/ssl3ext.c

-+++ b/nss/lib/ssl/ssl3ext.c

-@@ -2306,7 +2306,11 @@ ssl3_CalculatePaddingExtensionLength(unsigned int clientHelloLength)

+diff -pu a/nss/lib/ssl/ssl3ext.c b/nss/lib/ssl/ssl3ext.c

+--- a/nss/lib/ssl/ssl3ext.c 2014-01-03 19:03:55.557150476 -0800

++++ b/nss/lib/ssl/ssl3ext.c 2014-01-03 19:04:04.597298171 -0800

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

clientHelloLength;

unsigned int extensionLength;

@@ -15,7 +14,7 @@

return 0;

}

-@@ -2327,7 +2331,7 @@ ssl3_AppendPaddingExtension(sslSocket *ss, unsigned int extensionLen,

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

PRUint32 maxBytes)

{

unsigned int paddingLen = extensionLen - 4;