Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: net/socket/socket_test_util.cc

Issue 4339001: Correctly handle SSL Client Authentication requests when connecting... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: use HostPortPair instead of host,port Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/socket_test_util.h" 5 #include "net/socket/socket_test_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 10
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 delete this; 458 delete this;
459 } 459 }
460 460
461 MockSSLClientSocket* ssl_client_socket_; 461 MockSSLClientSocket* ssl_client_socket_;
462 net::CompletionCallback* user_callback_; 462 net::CompletionCallback* user_callback_;
463 int rv_; 463 int rv_;
464 }; 464 };
465 465
466 MockSSLClientSocket::MockSSLClientSocket( 466 MockSSLClientSocket::MockSSLClientSocket(
467 net::ClientSocketHandle* transport_socket, 467 net::ClientSocketHandle* transport_socket,
468 const std::string& hostname, 468 const HostPortPair& host_port_pair,
469 const net::SSLConfig& ssl_config, 469 const net::SSLConfig& ssl_config,
470 SSLHostInfo* ssl_host_info, 470 SSLHostInfo* ssl_host_info,
471 net::SSLSocketDataProvider* data) 471 net::SSLSocketDataProvider* data)
472 : MockClientSocket(transport_socket->socket()->NetLog().net_log()), 472 : MockClientSocket(transport_socket->socket()->NetLog().net_log()),
473 transport_(transport_socket), 473 transport_(transport_socket),
474 data_(data), 474 data_(data),
475 is_npn_state_set_(false), 475 is_npn_state_set_(false),
476 new_npn_value_(false) { 476 new_npn_value_(false) {
477 DCHECK(data_); 477 DCHECK(data_);
478 delete ssl_host_info; // we take ownership but don't use it. 478 delete ssl_host_info; // we take ownership but don't use it.
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 SocketDataProvider* data_provider = mock_data_.GetNext(); 1006 SocketDataProvider* data_provider = mock_data_.GetNext();
1007 MockTCPClientSocket* socket = 1007 MockTCPClientSocket* socket =
1008 new MockTCPClientSocket(addresses, net_log, data_provider); 1008 new MockTCPClientSocket(addresses, net_log, data_provider);
1009 data_provider->set_socket(socket); 1009 data_provider->set_socket(socket);
1010 tcp_client_sockets_.push_back(socket); 1010 tcp_client_sockets_.push_back(socket);
1011 return socket; 1011 return socket;
1012 } 1012 }
1013 1013
1014 SSLClientSocket* MockClientSocketFactory::CreateSSLClientSocket( 1014 SSLClientSocket* MockClientSocketFactory::CreateSSLClientSocket(
1015 ClientSocketHandle* transport_socket, 1015 ClientSocketHandle* transport_socket,
1016 const std::string& hostname, 1016 const HostPortPair& host_and_port,
1017 const SSLConfig& ssl_config, 1017 const SSLConfig& ssl_config,
1018 SSLHostInfo* ssl_host_info, 1018 SSLHostInfo* ssl_host_info,
1019 DnsRRResolver* dnsrr_resolver) { 1019 DnsRRResolver* dnsrr_resolver) {
1020 MockSSLClientSocket* socket = 1020 MockSSLClientSocket* socket =
1021 new MockSSLClientSocket(transport_socket, hostname, ssl_config, 1021 new MockSSLClientSocket(transport_socket, host_and_port, ssl_config,
1022 ssl_host_info, mock_ssl_data_.GetNext()); 1022 ssl_host_info, mock_ssl_data_.GetNext());
1023 ssl_client_sockets_.push_back(socket); 1023 ssl_client_sockets_.push_back(socket);
1024 return socket; 1024 return socket;
1025 } 1025 }
1026 1026
1027 DeterministicMockClientSocketFactory::DeterministicMockClientSocketFactory() {} 1027 DeterministicMockClientSocketFactory::DeterministicMockClientSocketFactory() {}
1028 1028
1029 DeterministicMockClientSocketFactory::~DeterministicMockClientSocketFactory() {} 1029 DeterministicMockClientSocketFactory::~DeterministicMockClientSocketFactory() {}
1030 1030
1031 void DeterministicMockClientSocketFactory::AddSocketDataProvider( 1031 void DeterministicMockClientSocketFactory::AddSocketDataProvider(
(...skipping 24 matching lines...) Expand all
1056 DeterministicSocketData* data_provider = mock_data().GetNext(); 1056 DeterministicSocketData* data_provider = mock_data().GetNext();
1057 DeterministicMockTCPClientSocket* socket = 1057 DeterministicMockTCPClientSocket* socket =
1058 new DeterministicMockTCPClientSocket(net_log, data_provider); 1058 new DeterministicMockTCPClientSocket(net_log, data_provider);
1059 data_provider->set_socket(socket->AsWeakPtr()); 1059 data_provider->set_socket(socket->AsWeakPtr());
1060 tcp_client_sockets().push_back(socket); 1060 tcp_client_sockets().push_back(socket);
1061 return socket; 1061 return socket;
1062 } 1062 }
1063 1063
1064 SSLClientSocket* DeterministicMockClientSocketFactory::CreateSSLClientSocket( 1064 SSLClientSocket* DeterministicMockClientSocketFactory::CreateSSLClientSocket(
1065 ClientSocketHandle* transport_socket, 1065 ClientSocketHandle* transport_socket,
1066 const std::string& hostname, 1066 const HostPortPair& host_and_port,
1067 const SSLConfig& ssl_config, 1067 const SSLConfig& ssl_config,
1068 SSLHostInfo* ssl_host_info, 1068 SSLHostInfo* ssl_host_info,
1069 DnsRRResolver* dnsrr_resolver) { 1069 DnsRRResolver* dnsrr_resolver) {
1070 MockSSLClientSocket* socket = 1070 MockSSLClientSocket* socket =
1071 new MockSSLClientSocket(transport_socket, hostname, ssl_config, 1071 new MockSSLClientSocket(transport_socket, host_and_port, ssl_config,
1072 ssl_host_info, mock_ssl_data_.GetNext()); 1072 ssl_host_info, mock_ssl_data_.GetNext());
1073 ssl_client_sockets_.push_back(socket); 1073 ssl_client_sockets_.push_back(socket);
1074 return socket; 1074 return socket;
1075 } 1075 }
1076 1076
1077 TestSocketRequest::TestSocketRequest( 1077 TestSocketRequest::TestSocketRequest(
1078 std::vector<TestSocketRequest*>* request_order, 1078 std::vector<TestSocketRequest*>* request_order,
1079 size_t* completion_count) 1079 size_t* completion_count)
1080 : request_order_(request_order), 1080 : request_order_(request_order),
1081 completion_count_(completion_count) { 1081 completion_count_(completion_count) {
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 1275
1276 const char kSOCKS5OkRequest[] = 1276 const char kSOCKS5OkRequest[] =
1277 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 }; 1277 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
1278 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest); 1278 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
1279 1279
1280 const char kSOCKS5OkResponse[] = 1280 const char kSOCKS5OkResponse[] =
1281 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 }; 1281 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
1282 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse); 1282 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
1283 1283
1284 } // namespace net 1284 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698