diff options
Diffstat (limited to 'net/third_party/nss/patches/cachecerts.patch')
| -rw-r--r-- | net/third_party/nss/patches/cachecerts.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/third_party/nss/patches/cachecerts.patch b/net/third_party/nss/patches/cachecerts.patch index adb7e3e..18fcc24 100644 --- a/net/third_party/nss/patches/cachecerts.patch +++ b/net/third_party/nss/patches/cachecerts.patch @@ -1,5 +1,5 @@ diff --git a/ssl/ssl3con.c b/ssl/ssl3con.c -index 529eb42..ebaee61 100644 +index 163572c..60af5b0 100644 --- a/ssl/ssl3con.c +++ b/ssl/ssl3con.c @@ -43,6 +43,7 @@ @@ -10,7 +10,7 @@ index 529eb42..ebaee61 100644 static PK11SymKey *ssl3_GenerateRSAPMS(sslSocket *ss, ssl3CipherSpec *spec, PK11SlotInfo * serverKeySlot); static SECStatus ssl3_DeriveMasterSecret(sslSocket *ss, PK11SymKey *pms); -@@ -6534,6 +6535,7 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length) +@@ -6549,6 +6550,7 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length) /* copy the peer cert from the SID */ if (sid->peerCert != NULL) { ss->sec.peerCert = CERT_DupCertificate(sid->peerCert); @@ -18,7 +18,7 @@ index 529eb42..ebaee61 100644 } /* NULL value for PMS signifies re-use of the old MS */ -@@ -8127,6 +8129,7 @@ compression_found: +@@ -8140,6 +8142,7 @@ compression_found: ss->sec.ci.sid = sid; if (sid->peerCert != NULL) { ss->sec.peerCert = CERT_DupCertificate(sid->peerCert); @@ -26,7 +26,7 @@ index 529eb42..ebaee61 100644 } /* -@@ -9750,6 +9753,44 @@ ssl3_CleanupPeerCerts(sslSocket *ss) +@@ -9763,6 +9766,44 @@ ssl3_CleanupPeerCerts(sslSocket *ss) ss->ssl3.peerCertChain = NULL; } @@ -71,7 +71,7 @@ index 529eb42..ebaee61 100644 /* Called from ssl3_HandleHandshakeMessage() when it has deciphered a complete * ssl3 CertificateStatus message. * Caller must hold Handshake and RecvBuf locks. -@@ -10028,6 +10069,7 @@ ssl3_AuthCertificate(sslSocket *ss) +@@ -10041,6 +10082,7 @@ ssl3_AuthCertificate(sslSocket *ss) } ss->sec.ci.sid->peerCert = CERT_DupCertificate(ss->sec.peerCert); @@ -80,7 +80,7 @@ index 529eb42..ebaee61 100644 if (!ss->sec.isServer) { CERTCertificate *cert = ss->sec.peerCert; diff --git a/ssl/sslimpl.h b/ssl/sslimpl.h -index 858ae0c..88a7039 100644 +index 1b38a52..086f6d2 100644 --- a/ssl/sslimpl.h +++ b/ssl/sslimpl.h @@ -597,6 +597,8 @@ typedef enum { never_cached, |