diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 03:00:43 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 03:00:43 +0000 |
| commit | e9f4523ae107022e73456185809e628f9fa5e214 (patch) | |
| tree | e232afdf1d6e2e300de576915d333eec87be7500 /net/third_party | |
| parent | f58dd60b2c60d2d5093ceec9046ae6e0f7f8a876 (diff) | |
| download | chromium_src-e9f4523ae107022e73456185809e628f9fa5e214.zip chromium_src-e9f4523ae107022e73456185809e628f9fa5e214.tar.gz chromium_src-e9f4523ae107022e73456185809e628f9fa5e214.tar.bz2 | |
If generating a domain bound cert fails, continue the connection without it.
BUG=125768
TEST=hack ServerBoundCertService::GenerateCert to always fail
Review URL: https://chromiumcodereview.appspot.com/10315008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/patches/restartclientauth.patch | 3 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/third_party/nss/patches/restartclientauth.patch b/net/third_party/nss/patches/restartclientauth.patch index 098e401..df31c37 100644 --- a/net/third_party/nss/patches/restartclientauth.patch +++ b/net/third_party/nss/patches/restartclientauth.patch @@ -16,7 +16,7 @@ diff -up a/src/net/third_party/nss/ssl/ssl.h b/src/net/third_party/nss/ssl/ssl.h 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-29 17:49:08.431530583 -0800 +++ b/src/net/third_party/nss/ssl/ssl3con.c 2012-02-29 18:55:27.038466043 -0800 -@@ -5769,6 +5769,84 @@ done: +@@ -5769,6 +5769,85 @@ done: return rv; } @@ -93,6 +93,7 @@ diff -up a/src/net/third_party/nss/ssl/ssl3con.c b/src/net/third_party/nss/ssl/s + if (certChain) { + CERT_DestroyCertificateList(certChain); + } ++ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); + rv = SECFailure; + } + return rv; diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index 5476fa5..55e4901 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -6087,6 +6087,7 @@ ssl3_RestartHandshakeAfterCertReq(sslSocket * ss, if (certChain) { CERT_DestroyCertificateList(certChain); } + PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); rv = SECFailure; } return rv; |