summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-21 05:46:58 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-21 05:46:58 +0000
commit65a3b914585cee20f1c8b213c82eaa2a5da0cb25 (patch)
tree1464c826e4dd82fb68e769119964c6a6383d609a /net/url_request
parentb3992377f4e52a205164d4da5dc7e465e749a57e (diff)
downloadchromium_src-65a3b914585cee20f1c8b213c82eaa2a5da0cb25.zip
chromium_src-65a3b914585cee20f1c8b213c82eaa2a5da0cb25.tar.gz
chromium_src-65a3b914585cee20f1c8b213c82eaa2a5da0cb25.tar.bz2
Reintegrate certificate selection in HttpNetworkTransaction DoLoop
The HttpNetworkTransaction refactor intercepts the client auth handling and moves it out of DoLoop. Because HandleCertificateRequest often switches states, this caused a DCHECK and crash in some circumstances. This reintegrates it and adds unit tests to catch the DCHECK. We really want to test sending a legitimate certificate, as well as more checking interesting errors, but we cannot import temporary keys yet. We also add a patch for tlslite to send a non-empty certificate_types. Apple's SSL implementation raises a protocol error otherwise. BUG=52744,51132,52778 TEST=SSLClientSocketTest.ConnectClientAuth*,URLRequestTest.ClientAuthTest Review URL: http://codereview.chromium.org/3141026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_unittest.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index aabb070..2ffb631 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -467,6 +467,17 @@ TEST_F(HTTPSRequestTest, ClientAuthTest) {
EXPECT_EQ(1, d.on_certificate_requested_count());
EXPECT_FALSE(d.received_data_before_response());
EXPECT_EQ(0, d.bytes_received());
+
+ // Send no certificate.
+ // TODO(davidben): Get temporary client cert import (with keys) working on
+ // all platforms so we can test sending a cert as well.
+ r.ContinueWithCertificate(NULL);
+
+ MessageLoop::current()->Run();
+
+ EXPECT_EQ(1, d.response_started_count());
+ EXPECT_FALSE(d.received_data_before_response());
+ EXPECT_NE(0, d.bytes_received());
}
}