summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 03:37:54 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 03:37:54 +0000
commit15450cf8853232db2ead8333fd77e5aadaae2524 (patch)
treec6d4218725310113967367f9574c92bb150b4761 /net
parent5fe1b8b76c903a4f4e19d9ed52d7ad36c1a8752b (diff)
downloadchromium_src-15450cf8853232db2ead8333fd77e5aadaae2524.zip
chromium_src-15450cf8853232db2ead8333fd77e5aadaae2524.tar.gz
chromium_src-15450cf8853232db2ead8333fd77e5aadaae2524.tar.bz2
Allow the SSLSocketDataProvider to carry cert information for use with the
MockSSLClientSocket. BUG=none TEST=<test infrastructure> Review URL: http://codereview.chromium.org/6651015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/socket_test_util.cc1
-rw-r--r--net/socket/socket_test_util.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 7e298b5..2ed4b83 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -1061,6 +1061,7 @@ bool MockSSLClientSocket::UsingTCPFastOpen() const {
void MockSSLClientSocket::GetSSLInfo(net::SSLInfo* ssl_info) {
ssl_info->Reset();
+ ssl_info->cert = data_->cert_;
}
void MockSSLClientSocket::GetSSLCertRequestInfo(
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 0929dce..7e00029 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -254,6 +254,7 @@ struct SSLSocketDataProvider {
std::string next_proto;
bool was_npn_negotiated;
net::SSLCertRequestInfo* cert_request_info;
+ scoped_refptr<X509Certificate> cert_;
};
// A DataProvider where the client must write a request before the reads (e.g.