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

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

Issue 10221018: net: don't set NSS options in a callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/patches/applypatches.sh ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con .c
2 index 5476fa5..1465558 100644
3 --- a/net/third_party/nss/ssl/ssl3con.c
4 +++ b/net/third_party/nss/ssl/ssl3con.c
5 @@ -6108,6 +6108,10 @@ ssl3_CanFalseStart(sslSocket *ss) {
6 rv = ss->opt.enableFalseStart &&
7 !ss->sec.isServer &&
8 !ss->ssl3.hs.isResuming &&
9 + /* This check for NPN is performed here because we can't call
10 + * SSL_HandshakeNegotiatedExtension in the auth callback because of
11 + * lock ordering issues. See crbug.com/125299 */
12 + ssl3_ExtensionNegotiated(ss, ssl_next_proto_nego_xtn) &&
13 ss->ssl3.cwSpec &&
14
15 /* An attacker can control the selected ciphersuite so we only wish to
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/applypatches.sh ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698