diff options
Diffstat (limited to 'chromium/net/third_party/nss/patches/cachecerts.patch')
| -rw-r--r-- | chromium/net/third_party/nss/patches/cachecerts.patch | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/chromium/net/third_party/nss/patches/cachecerts.patch b/chromium/net/third_party/nss/patches/cachecerts.patch index 6e55deab5df..fce438b66c4 100644 --- a/chromium/net/third_party/nss/patches/cachecerts.patch +++ b/chromium/net/third_party/nss/patches/cachecerts.patch @@ -1,6 +1,6 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c ---- a/nss/lib/ssl/ssl3con.c 2013-07-31 12:29:35.584231452 -0700 -+++ b/nss/lib/ssl/ssl3con.c 2013-07-31 12:31:22.785789376 -0700 +--- a/nss/lib/ssl/ssl3con.c 2014-01-17 17:49:26.062517203 -0800 ++++ b/nss/lib/ssl/ssl3con.c 2014-01-17 17:51:23.974478249 -0800 @@ -43,6 +43,7 @@ static SECStatus ssl3_AuthCertificate(sslSocket *ss); @@ -9,7 +9,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c static PK11SymKey *ssl3_GenerateRSAPMS(sslSocket *ss, ssl3CipherSpec *spec, PK11SlotInfo * serverKeySlot); static SECStatus ssl3_DeriveMasterSecret(sslSocket *ss, PK11SymKey *pms); -@@ -6141,6 +6142,7 @@ ssl3_HandleServerHello(sslSocket *ss, SS +@@ -6474,6 +6475,7 @@ ssl3_HandleServerHello(sslSocket *ss, SS /* copy the peer cert from the SID */ if (sid->peerCert != NULL) { ss->sec.peerCert = CERT_DupCertificate(sid->peerCert); @@ -17,7 +17,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c } /* NULL value for PMS signifies re-use of the old MS */ -@@ -7538,6 +7540,7 @@ compression_found: +@@ -8048,6 +8050,7 @@ compression_found: ss->sec.ci.sid = sid; if (sid->peerCert != NULL) { ss->sec.peerCert = CERT_DupCertificate(sid->peerCert); @@ -25,7 +25,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c } /* -@@ -9147,6 +9150,44 @@ ssl3_CleanupPeerCerts(sslSocket *ss) +@@ -9662,6 +9665,44 @@ ssl3_CleanupPeerCerts(sslSocket *ss) ss->ssl3.peerCertChain = NULL; } @@ -70,7 +70,7 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c /* Called from ssl3_HandleHandshakeMessage() when it has deciphered a complete * ssl3 CertificateStatus message. * Caller must hold Handshake and RecvBuf locks. -@@ -9432,6 +9473,7 @@ ssl3_AuthCertificate(sslSocket *ss) +@@ -9940,6 +9981,7 @@ ssl3_AuthCertificate(sslSocket *ss) } ss->sec.ci.sid->peerCert = CERT_DupCertificate(ss->sec.peerCert); @@ -79,16 +79,19 @@ diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c if (!ss->sec.isServer) { CERTCertificate *cert = ss->sec.peerCert; diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h ---- a/nss/lib/ssl/sslimpl.h 2013-07-31 12:07:10.974699609 -0700 -+++ b/nss/lib/ssl/sslimpl.h 2013-07-31 12:31:22.785789376 -0700 -@@ -572,10 +572,13 @@ typedef enum { never_cached, +--- a/nss/lib/ssl/sslimpl.h 2014-01-17 17:49:26.072517368 -0800 ++++ b/nss/lib/ssl/sslimpl.h 2014-01-17 17:51:23.984478418 -0800 +@@ -595,6 +595,8 @@ typedef enum { never_cached, invalid_cache /* no longer in any cache. */ } Cached; +#define MAX_PEER_CERT_CHAIN_SIZE 8 + struct sslSessionIDStr { - sslSessionID * next; /* chain used for client sockets, only */ + /* The global cache lock must be held when accessing these members when the + * sid is in any cache. +@@ -609,6 +611,7 @@ struct sslSessionIDStr { + */ CERTCertificate * peerCert; + CERTCertificate * peerCertChain[MAX_PEER_CERT_CHAIN_SIZE]; @@ -96,17 +99,17 @@ diff -pu a/nss/lib/ssl/sslimpl.h b/nss/lib/ssl/sslimpl.h const char * peerID; /* client only */ const char * urlSvrName; /* client only */ diff -pu a/nss/lib/ssl/sslnonce.c b/nss/lib/ssl/sslnonce.c ---- a/nss/lib/ssl/sslnonce.c 2013-07-31 12:07:10.974699609 -0700 -+++ b/nss/lib/ssl/sslnonce.c 2013-07-31 12:31:22.785789376 -0700 +--- a/nss/lib/ssl/sslnonce.c 2014-01-17 17:49:26.072517368 -0800 ++++ b/nss/lib/ssl/sslnonce.c 2014-01-17 17:51:23.984478418 -0800 @@ -164,6 +164,7 @@ lock_cache(void) static void ssl_DestroySID(sslSessionID *sid) { + int i; SSL_TRC(8, ("SSL: destroy sid: sid=0x%x cached=%d", sid, sid->cached)); - PORT_Assert((sid->references == 0)); - -@@ -183,6 +184,9 @@ ssl_DestroySID(sslSessionID *sid) + PORT_Assert(sid->references == 0); + PORT_Assert(sid->cached != in_client_cache); +@@ -194,6 +195,9 @@ ssl_DestroySID(sslSessionID *sid) if ( sid->peerCert ) { CERT_DestroyCertificate(sid->peerCert); } |