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

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/nullcipher_934016.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:

OLD	NEW
	(Empty)
1 diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con .c

2 index 8395f61..8b8b758 100644

3 --- a/net/third_party/nss/ssl/ssl3con.c

4 +++ b/net/third_party/nss/ssl/ssl3con.c

5 @@ -859,6 +859,11 @@ static SECStatus

6 Null_Cipher(void ctx, unsigned char output, int *outputLen, int maxOutputLen,

7 const unsigned char *input, int inputLen)

8 {

9 + if (inputLen > maxOutputLen) {

10 + outputLen = 0; / Match PK11_CipherOp in setting outputLen */

11 + PORT_SetError(SEC_ERROR_OUTPUT_LEN);

12 + return SECFailure;

13 + }

14 *outputLen = inputLen;

15 if (input != output)

16 PORT_Memcpy(output, input, inputLen);

OLD	NEW