net/third_party/nss/patches/nobypass.patch - Issue 1844813002: Uprev NSS to 3.23 on iOS

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/nobypass.patch

Issue 1844813002: Uprev NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: One more GN fix Created 4 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/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c

	2 index 7649abe..b6f4987 100644

	3 --- a/lib/ssl/ssl3con.c

	4 +++ b/lib/ssl/ssl3con.c

	5 @@ -2297,6 +2297,7 @@ fail:

	6 return SECFailure;

	7 }

	8

	9 +#ifndef NO_PKCS11_BYPASS

	10 /* Returns whether we can bypass PKCS#11 for a given cipher algorithm.

	11 *

	12 * We do not support PKCS#11 bypass for ChaCha20/Poly1305.

	13 @@ -2311,6 +2312,7 @@ ssl3_CanBypassCipher(SSLCipherAlgorithm calg)

	14 return PR_TRUE;

	15 }

	16 }

	17 +#endif

	18

	19 /* Complete the initialization of all keys, ciphers, MACs and their contexts

	20 * for the pending Cipher Spec.

OLD	NEW