Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

Side by Side Diff: net/third_party/nss/patches/renegoscsv.patch

Issue 9733012: Update NSS to NSS 3.13.4 pre-release snapshot 20120319. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Forgot to update the sslerr.h and SSLerrs.h files Created 8 years, 9 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
OLDNEW
1 From 552c8d41b9ac9d55c8f1a861d81fc070a2a72aba Mon Sep 17 00:00:00 2001 1 diff -pu -r a/src/net/third_party/nss/ssl/ssl3con.c b/src/net/third_party/nss/ss l/ssl3con.c
2 From: Adam Langley <agl@chromium.org> 2 --- a/src/net/third_party/nss/ssl/ssl3con.c» 2012-03-17 17:31:19.000000000 -0 700
3 Date: Mon, 3 Oct 2011 12:20:10 -0400 3 +++ b/src/net/third_party/nss/ssl/ssl3con.c» 2012-03-19 12:35:33.058193252 -0 700
4 Subject: [PATCH] renegoscsv.patch 4 @@ -3966,9 +3966,9 @@ ssl3_SendClientHello(sslSocket *ss)
5
6 ---
7 mozilla/security/nss/lib/ssl/ssl3con.c | 4 ++--
8 1 files changed, 2 insertions(+), 2 deletions(-)
9
10 diff --git a/mozilla/security/nss/lib/ssl/ssl3con.c b/mozilla/security/nss/lib/s sl/ssl3con.c
11 index e0cb4e9..455a532 100644
12 --- a/mozilla/security/nss/lib/ssl/ssl3con.c
13 +++ b/mozilla/security/nss/lib/ssl/ssl3con.c
14 @@ -3874,9 +3874,9 @@ ssl3_SendClientHello(sslSocket *ss)
15 return SECFailure; /* ssl3_config_match_init has set error code. */ 5 return SECFailure; /* ssl3_config_match_init has set error code. */
16 6
17 /* 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,
18 - * 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.
19 + * only if TLS is disabled. 9 + * only if TLS is disabled.
20 */ 10 */
21 - if (!ss->firstHsDone && ss->opt.enableSSL3) { 11 - if (!ss->firstHsDone && ss->vrange.min == SSL_LIBRARY_VERSION_3_0) {
22 + if (!ss->firstHsDone && !isTLS) { 12 + if (!ss->firstHsDone && !isTLS) {
23 /* Must set this before calling Hello Extension Senders, 13 /* Must set this before calling Hello Extension Senders,
24 * to suppress sending of empty RI extension. 14 * to suppress sending of empty RI extension.
25 */ 15 */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698