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

Side by Side Diff: net/third_party/nss/patches/falsestartnpn.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 --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con .c 1 diff -pu -r a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3co n.c
2 index e8a7f01..b6f4313 100644 2 --- a/net/third_party/nss/ssl/ssl3con.c»2012-11-09 15:53:13.884846338 -0800
3 --- a/net/third_party/nss/ssl/ssl3con.c 3 +++ b/net/third_party/nss/ssl/ssl3con.c»2012-11-09 15:54:18.975797410 -0800
4 +++ b/net/third_party/nss/ssl/ssl3con.c 4 @@ -6244,10 +6244,17 @@ ssl3_CanFalseStart(sslSocket *ss) {
5 @@ -6087,10 +6087,17 @@ ssl3_CanFalseStart(sslSocket *ss) {
6 !ss->sec.isServer && 5 !ss->sec.isServer &&
7 !ss->ssl3.hs.isResuming && 6 !ss->ssl3.hs.isResuming &&
8 ss->ssl3.cwSpec && 7 ss->ssl3.cwSpec &&
9 + 8 +
10 + /* An attacker can control the selected ciphersuite so we only wish to 9 + /* An attacker can control the selected ciphersuite so we only wish to
11 + * do False Start in the case that the selected ciphersuite is 10 + * do False Start in the case that the selected ciphersuite is
12 + * sufficiently strong that the attack can gain no advantage. 11 + * sufficiently strong that the attack can gain no advantage.
13 + * Therefore we require an 80-bit cipher and a forward-secret key 12 + * Therefore we require an 80-bit cipher and a forward-secret key
14 + * exchange. */ 13 + * exchange. */
15 ss->ssl3.cwSpec->cipher_def->secret_key_size >= 10 && 14 ss->ssl3.cwSpec->cipher_def->secret_key_size >= 10 &&
16 - (ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_rsa || 15 - (ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_rsa ||
17 - ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_dh || 16 - ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_dh ||
18 - ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_ecdh); 17 - ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_ecdh);
19 + (ss->ssl3.hs.kea_def->kea == kea_dhe_dss || 18 + (ss->ssl3.hs.kea_def->kea == kea_dhe_dss ||
20 + ss->ssl3.hs.kea_def->kea == kea_dhe_rsa || 19 + ss->ssl3.hs.kea_def->kea == kea_dhe_rsa ||
21 + ss->ssl3.hs.kea_def->kea == kea_ecdhe_ecdsa || 20 + ss->ssl3.hs.kea_def->kea == kea_ecdhe_ecdsa ||
22 + ss->ssl3.hs.kea_def->kea == kea_ecdhe_rsa); 21 + ss->ssl3.hs.kea_def->kea == kea_ecdhe_rsa);
23 ssl_ReleaseSpecReadLock(ss); 22 ssl_ReleaseSpecReadLock(ss);
24 return rv; 23 return rv;
25 } 24 }
26 diff --git a/net/third_party/nss/ssl/ssl3ext.c b/net/third_party/nss/ssl/ssl3ext .c 25 diff -pu -r a/net/third_party/nss/ssl/ssl3ext.c b/net/third_party/nss/ssl/ssl3ex t.c
27 index 80c1f7f..6d5866b 100644 26 --- a/net/third_party/nss/ssl/ssl3ext.c»2012-11-09 15:39:36.842891686 -0800
28 --- a/net/third_party/nss/ssl/ssl3ext.c 27 +++ b/net/third_party/nss/ssl/ssl3ext.c»2012-11-09 15:56:10.157421377 -0800
29 +++ b/net/third_party/nss/ssl/ssl3ext.c 28 @@ -537,6 +537,12 @@ ssl3_ServerHandleNextProtoNegoXtn(sslSoc
30 @@ -567,6 +567,12 @@ ssl3_ServerHandleNextProtoNegoXtn(sslSocket * ss, PRUint16 ex_type, SECItem *dat
31 return SECFailure; 29 return SECFailure;
32 } 30 }
33 31
34 + ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type; 32 + ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
35 + 33 +
36 + /* TODO: server side NPN support would require calling 34 + /* TODO: server side NPN support would require calling
37 + * ssl3_RegisterServerHelloExtensionSender here in order to echo the 35 + * ssl3_RegisterServerHelloExtensionSender here in order to echo the
38 + * extension back to the client. */ 36 + * extension back to the client. */
39 + 37 +
40 return SECSuccess; 38 return SECSuccess;
41 } 39 }
42 40
43 @@ -635,6 +641,8 @@ ssl3_ClientHandleNextProtoNegoXtn(sslSocket *ss, PRUint16 ex _type, 41 @@ -605,6 +611,8 @@ ssl3_ClientHandleNextProtoNegoXtn(sslSoc
44 return SECFailure; 42 return SECFailure;
45 } 43 }
46 44
47 + ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type; 45 + ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
48 + 46 +
49 SECITEM_FreeItem(&ss->ssl3.nextProto, PR_FALSE); 47 SECITEM_FreeItem(&ss->ssl3.nextProto, PR_FALSE);
50 return SECITEM_CopyItem(NULL, &ss->ssl3.nextProto, &result); 48 return SECITEM_CopyItem(NULL, &ss->ssl3.nextProto, &result);
51 } 49 }
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/ecpointform.patch ('k') | net/third_party/nss/patches/getchannelinfo.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698