| Index: net/third_party/nss/patches/falsestartnpn.patch
|
| ===================================================================
|
| --- net/third_party/nss/patches/falsestartnpn.patch (revision 196870)
|
| +++ net/third_party/nss/patches/falsestartnpn.patch (working copy)
|
| @@ -1,49 +0,0 @@
|
| -diff -pu -r a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c
|
| ---- a/net/third_party/nss/ssl/ssl3con.c 2012-11-09 15:53:13.884846338 -0800
|
| -+++ b/net/third_party/nss/ssl/ssl3con.c 2012-11-09 15:54:18.975797410 -0800
|
| -@@ -6244,10 +6244,17 @@ ssl3_CanFalseStart(sslSocket *ss) {
|
| - !ss->sec.isServer &&
|
| - !ss->ssl3.hs.isResuming &&
|
| - ss->ssl3.cwSpec &&
|
| -+
|
| -+ /* An attacker can control the selected ciphersuite so we only wish to
|
| -+ * do False Start in the case that the selected ciphersuite is
|
| -+ * sufficiently strong that the attack can gain no advantage.
|
| -+ * Therefore we require an 80-bit cipher and a forward-secret key
|
| -+ * exchange. */
|
| - ss->ssl3.cwSpec->cipher_def->secret_key_size >= 10 &&
|
| -- (ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_rsa ||
|
| -- ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_dh ||
|
| -- ss->ssl3.hs.kea_def->exchKeyType == ssl_kea_ecdh);
|
| -+ (ss->ssl3.hs.kea_def->kea == kea_dhe_dss ||
|
| -+ ss->ssl3.hs.kea_def->kea == kea_dhe_rsa ||
|
| -+ ss->ssl3.hs.kea_def->kea == kea_ecdhe_ecdsa ||
|
| -+ ss->ssl3.hs.kea_def->kea == kea_ecdhe_rsa);
|
| - ssl_ReleaseSpecReadLock(ss);
|
| - return rv;
|
| - }
|
| -diff -pu -r a/net/third_party/nss/ssl/ssl3ext.c b/net/third_party/nss/ssl/ssl3ext.c
|
| ---- a/net/third_party/nss/ssl/ssl3ext.c 2012-11-09 15:39:36.842891686 -0800
|
| -+++ b/net/third_party/nss/ssl/ssl3ext.c 2012-11-09 15:56:10.157421377 -0800
|
| -@@ -537,6 +537,12 @@ ssl3_ServerHandleNextProtoNegoXtn(sslSoc
|
| - return SECFailure;
|
| - }
|
| -
|
| -+ ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
|
| -+
|
| -+ /* TODO: server side NPN support would require calling
|
| -+ * ssl3_RegisterServerHelloExtensionSender here in order to echo the
|
| -+ * extension back to the client. */
|
| -+
|
| - return SECSuccess;
|
| - }
|
| -
|
| -@@ -605,6 +611,8 @@ ssl3_ClientHandleNextProtoNegoXtn(sslSoc
|
| - return SECFailure;
|
| - }
|
| -
|
| -+ ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
|
| -+
|
| - SECITEM_FreeItem(&ss->ssl3.nextProto, PR_FALSE);
|
| - return SECITEM_CopyItem(NULL, &ss->ssl3.nextProto, &result);
|
| - }
|
|
|