Index: net/third_party/nss/patches/secret_exporter.patch |
=================================================================== |
--- net/third_party/nss/patches/secret_exporter.patch (revision 124804) |
+++ net/third_party/nss/patches/secret_exporter.patch (working copy) |
@@ -1,33 +1,7 @@ |
-From a30a1a87579d0a0d2950ee685a41bae428f38284 Mon Sep 17 00:00:00 2001 |
-From: Adam Langley <agl@chromium.org> |
-Date: Mon, 3 Oct 2011 12:25:44 -0400 |
-Subject: [PATCH] secret_exporter.patch |
- |
---- |
- mozilla/security/nss/lib/ssl/ssl.def | 1 + |
- mozilla/security/nss/lib/ssl/ssl.h | 13 ++++++ |
- mozilla/security/nss/lib/ssl/ssl3con.c | 63 ++++++++++++++++++++----------- |
- mozilla/security/nss/lib/ssl/sslimpl.h | 6 +++ |
- mozilla/security/nss/lib/ssl/sslinfo.c | 64 ++++++++++++++++++++++++++++++++ |
- 5 files changed, 125 insertions(+), 22 deletions(-) |
- |
-diff --git a/mozilla/security/nss/lib/ssl/ssl.def b/mozilla/security/nss/lib/ssl/ssl.def |
-index 7ef15db..1993d3e 100644 |
---- a/mozilla/security/nss/lib/ssl/ssl.def |
-+++ b/mozilla/security/nss/lib/ssl/ssl.def |
-@@ -154,6 +154,7 @@ SSL_SNISocketConfigHook; |
- ;+}; |
- ;+NSS_CHROMIUM { |
- ;+ global: |
-+SSL_ExportKeyingMaterial; |
- SSL_GetNextProto; |
- SSL_GetStapledOCSPResponse; |
- SSL_HandshakeResumedSession; |
-diff --git a/mozilla/security/nss/lib/ssl/ssl.h b/mozilla/security/nss/lib/ssl/ssl.h |
-index 1115fa9..835d3cf 100644 |
---- a/mozilla/security/nss/lib/ssl/ssl.h |
-+++ b/mozilla/security/nss/lib/ssl/ssl.h |
-@@ -653,6 +653,19 @@ SSL_IMPORT SECStatus SSL_GetCipherSuiteInfo(PRUint16 cipherSuite, |
+diff -up a/src/net/third_party/nss/ssl/ssl.h b/src/net/third_party/nss/ssl/ssl.h |
+--- a/src/net/third_party/nss/ssl/ssl.h 2012-02-29 17:12:15.720044263 -0800 |
++++ b/src/net/third_party/nss/ssl/ssl.h 2012-02-29 17:18:04.824794558 -0800 |
+@@ -774,6 +774,19 @@ SSL_IMPORT SECStatus SSL_GetCipherSuiteI |
/* Returnes negotiated through SNI host info. */ |
SSL_IMPORT SECItem *SSL_GetNegotiatedHostInfo(PRFileDesc *fd); |
@@ -47,11 +21,10 @@ |
/* |
** Return a new reference to the certificate that was most recently sent |
** to the peer on this SSL/TLS connection, or NULL if none has been sent. |
-diff --git a/mozilla/security/nss/lib/ssl/ssl3con.c b/mozilla/security/nss/lib/ssl/ssl3con.c |
-index 2648cbe..f8838d6 100644 |
---- a/mozilla/security/nss/lib/ssl/ssl3con.c |
-+++ b/mozilla/security/nss/lib/ssl/ssl3con.c |
-@@ -8371,33 +8371,33 @@ ssl3_RestartHandshakeAfterServerCert(sslSocket *ss) |
+diff -up a/src/net/third_party/nss/ssl/ssl3con.c b/src/net/third_party/nss/ssl/ssl3con.c |
+--- a/src/net/third_party/nss/ssl/ssl3con.c 2012-02-28 20:34:50.114663722 -0800 |
++++ b/src/net/third_party/nss/ssl/ssl3con.c 2012-02-29 17:18:04.824794558 -0800 |
+@@ -8368,33 +8368,33 @@ done: |
return rv; |
} |
@@ -101,7 +74,7 @@ |
PK11_DestroyContext(prf_context, PR_TRUE); |
} else { |
-@@ -8406,17 +8406,36 @@ ssl3_ComputeTLSFinished(ssl3CipherSpec *spec, |
+@@ -8403,17 +8403,36 @@ ssl3_ComputeTLSFinished(ssl3CipherSpec * |
SECItem outData = { siBuffer, }; |
PRBool isFIPS = PR_FALSE; |
@@ -144,11 +117,10 @@ |
/* called from ssl3_HandleServerHelloDone |
*/ |
static SECStatus |
-diff --git a/mozilla/security/nss/lib/ssl/sslimpl.h b/mozilla/security/nss/lib/ssl/sslimpl.h |
-index 973a3c9..906874a 100644 |
---- a/mozilla/security/nss/lib/ssl/sslimpl.h |
-+++ b/mozilla/security/nss/lib/ssl/sslimpl.h |
-@@ -1680,6 +1680,12 @@ SECStatus SSL_DisableDefaultExportCipherSuites(void); |
+diff -up a/src/net/third_party/nss/ssl/sslimpl.h b/src/net/third_party/nss/ssl/sslimpl.h |
+--- a/src/net/third_party/nss/ssl/sslimpl.h 2012-02-29 17:12:15.720044263 -0800 |
++++ b/src/net/third_party/nss/ssl/sslimpl.h 2012-02-29 17:16:59.143900589 -0800 |
+@@ -1709,6 +1709,11 @@ SECStatus SSL_DisableDefaultExportCipher |
SECStatus SSL_DisableExportCipherSuites(PRFileDesc * fd); |
PRBool SSL_IsExportCipherSuite(PRUint16 cipherSuite); |
@@ -157,14 +129,12 @@ |
+ unsigned int labelLen, const unsigned char *val, |
+ unsigned int valLen, unsigned char *out, |
+ unsigned int outLen); |
-+ |
- /********************** FNV hash *********************/ |
- void FNV1A64_Init(PRUint64 *digest); |
-diff --git a/mozilla/security/nss/lib/ssl/sslinfo.c b/mozilla/security/nss/lib/ssl/sslinfo.c |
-index 96377b0..cf870c7 100644 |
---- a/mozilla/security/nss/lib/ssl/sslinfo.c |
-+++ b/mozilla/security/nss/lib/ssl/sslinfo.c |
+ #ifdef TRACE |
+ #define SSL_TRACE(msg) ssl_Trace msg |
+diff -up a/src/net/third_party/nss/ssl/sslinfo.c b/src/net/third_party/nss/ssl/sslinfo.c |
+--- a/src/net/third_party/nss/ssl/sslinfo.c 2010-09-01 18:12:57.000000000 -0700 |
++++ b/src/net/third_party/nss/ssl/sslinfo.c 2012-02-29 17:18:04.824794558 -0800 |
@@ -20,6 +20,7 @@ |
* |
* Contributor(s): |
@@ -173,7 +143,7 @@ |
* |
* Alternatively, the contents of this file may be used under the terms of |
* either the GNU General Public License Version 2 or later (the "GPL"), or |
-@@ -316,6 +317,69 @@ SSL_IsExportCipherSuite(PRUint16 cipherSuite) |
+@@ -316,6 +317,69 @@ SSL_IsExportCipherSuite(PRUint16 cipherS |
return PR_FALSE; |
} |