diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 23:10:26 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 23:10:26 +0000 |
| commit | f5f27cd9de2fb8e2152263338b1f0f74f24428e7 (patch) | |
| tree | 6ed2254c8941ac2b2e41821374d4dbbfe9828068 /net | |
| parent | 71eb1e6d22b1216c40a09d50c11412596b60fe2e (diff) | |
| download | chromium_src-f5f27cd9de2fb8e2152263338b1f0f74f24428e7.zip chromium_src-f5f27cd9de2fb8e2152263338b1f0f74f24428e7.tar.gz chromium_src-f5f27cd9de2fb8e2152263338b1f0f74f24428e7.tar.bz2 | |
net: fix caching of peer's cert chain in session objects.
BUG=91341
TEST=none
Review URL: http://codereview.chromium.org/7549020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/third_party/nss/patches/cachedinfo.patch | 13 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/net/third_party/nss/patches/cachedinfo.patch b/net/third_party/nss/patches/cachedinfo.patch index dac852a..14fa9ff 100644 --- a/net/third_party/nss/patches/cachedinfo.patch +++ b/net/third_party/nss/patches/cachedinfo.patch @@ -1,4 +1,4 @@ -commit 070963bde0a9c474733f19fbd525ff14e3f15803 +commit b84efe75d31ad7e16bf8e97845d264a0f5994a3f Author: Adam Langley <agl@chromium.org> Date: Fri Jun 24 13:10:38 2011 -0400 @@ -153,7 +153,7 @@ index 563cfd5..e7d6c54 100644 ** certificate for the server and the servers private key. The arguments ** are copied. diff --git a/mozilla/security/nss/lib/ssl/ssl3con.c b/mozilla/security/nss/lib/ssl/ssl3con.c -index 0997e18..f7064ef 100644 +index 0997e18..068f021 100644 --- a/mozilla/security/nss/lib/ssl/ssl3con.c +++ b/mozilla/security/nss/lib/ssl/ssl3con.c @@ -5170,7 +5170,6 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length) @@ -406,6 +406,15 @@ index 0997e18..f7064ef 100644 ssl_SetAlwaysBlock(ss); goto cert_block; } +@@ -8134,7 +8232,7 @@ ssl3_HandleCertificate(sslSocket *ss, SSL3Opaque *b, PRUint32 length) + } + + ss->sec.ci.sid->peerCert = CERT_DupCertificate(ss->sec.peerCert); +- ssl3_CopyPeerCertsToSID(certs, ss->sec.ci.sid); ++ ssl3_CopyPeerCertsToSID(ss->ssl3.peerCertChain, ss->sec.ci.sid); + + if (!ss->sec.isServer) { + /* set the server authentication and key exchange types and sizes @@ -8179,8 +8277,6 @@ ssl3_HandleCertificate(sslSocket *ss, SSL3Opaque *b, PRUint32 length) } } diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index 3ae9167..fd34b9f 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -8256,7 +8256,7 @@ ssl3_HandleCertificate(sslSocket *ss, SSL3Opaque *b, PRUint32 length) } ss->sec.ci.sid->peerCert = CERT_DupCertificate(ss->sec.peerCert); - ssl3_CopyPeerCertsToSID(certs, ss->sec.ci.sid); + ssl3_CopyPeerCertsToSID(ss->ssl3.peerCertChain, ss->sec.ci.sid); if (!ss->sec.isServer) { /* set the server authentication and key exchange types and sizes |