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

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

Issue 11275240: Update net/third_party/nss/ssl to NSS 3.14. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before commit Created 8 years, 1 month 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 diff -pu -r a/src/net/third_party/nss/ssl/ssl3con.c b/src/net/third_party/nss/ss l/ssl3con.c 1 diff -pu -r a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3co n.c
2 --- a/src/net/third_party/nss/ssl/ssl3con.c» 2012-03-17 17:31:19.000000000 -0 700 2 --- a/net/third_party/nss/ssl/ssl3con.c»2012-09-27 22:10:25.000000000 -0700
3 +++ b/src/net/third_party/nss/ssl/ssl3con.c» 2012-03-19 12:35:33.058193252 -0 700 3 +++ b/net/third_party/nss/ssl/ssl3con.c»2012-11-09 15:18:00.923858639 -0800
4 @@ -3966,9 +3966,9 @@ ssl3_SendClientHello(sslSocket *ss) 4 @@ -4236,9 +4236,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 */
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/renegoclientversion.patch ('k') | net/third_party/nss/patches/restartclientauth.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698