net/third_party/nss/patches/renegoscsv.patch - Issue 14522022: Update NSS libSSL to NSS_3_15_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/renegoscsv.patch

Issue 14522022: Update NSS libSSL to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Adjust secitemarray.patch, remove handlecertloser.patch Created 7 years, 7 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
1 diff -pu -r a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3co n.c	1 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c

2 --- a/net/third_party/nss/ssl/ssl3con.c»2012-09-27 22:10:25.000000000 -0700	2 --- a/nss/lib/ssl/ssl3con.c» 2013-04-27 09:17:17.216390477 -0700

3 +++ b/net/third_party/nss/ssl/ssl3con.c»2012-11-09 15:18:00.923858639 -0800	3 +++ b/nss/lib/ssl/ssl3con.c» 2013-04-27 09:19:20.388134720 -0700

4 @@ -4236,9 +4236,9 @@ ssl3_SendClientHello(sslSocket *ss, PRBo	4 @@ -4358,9 +4358,9 @@ ssl3_SendClientHello(sslSocket *ss, PRBo

5 return SECFailure; /* ssl3_config_match_init has set error code. */	5 return SECFailure; /* ssl3_config_match_init has set error code. */

6	6

7 /* HACK for SCSV in SSL 3.0. On initial handshake, prepend SCSV,	7 /* HACK for SCSV in SSL 3.0. On initial handshake, prepend SCSV,

8 - * only if we're willing to complete an SSL 3.0 handshake.	8 - * only if we're willing to complete an SSL 3.0 handshake.

9 + * only if TLS is disabled.	9 + * only if TLS is disabled.

10 */	10 */

11 - if (!ss->firstHsDone && ss->vrange.min == SSL_LIBRARY_VERSION_3_0) {	11 - if (!ss->firstHsDone && ss->vrange.min == SSL_LIBRARY_VERSION_3_0) {

12 + if (!ss->firstHsDone && !isTLS) {	12 + if (!ss->firstHsDone && !isTLS) {

13 /* Must set this before calling Hello Extension Senders,	13 /* Must set this before calling Hello Extension Senders,

14 * to suppress sending of empty RI extension.	14 * to suppress sending of empty RI extension.

15 */	15 */

OLD	NEW