| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ssl_client_socket.h" | 5 #include "net/socket/ssl_client_socket.h" |
| 6 | 6 |
| 7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "net/base/address_list.h" | 9 #include "net/base/address_list.h" |
| 10 #include "net/base/io_buffer.h" | 10 #include "net/base/io_buffer.h" |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 } | 508 } |
| 509 | 509 |
| 510 protected: | 510 protected: |
| 511 scoped_ptr<SSLClientSocket> CreateSSLClientSocket( | 511 scoped_ptr<SSLClientSocket> CreateSSLClientSocket( |
| 512 scoped_ptr<StreamSocket> transport_socket, | 512 scoped_ptr<StreamSocket> transport_socket, |
| 513 const HostPortPair& host_and_port, | 513 const HostPortPair& host_and_port, |
| 514 const SSLConfig& ssl_config) { | 514 const SSLConfig& ssl_config) { |
| 515 scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); | 515 scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); |
| 516 connection->SetSocket(transport_socket.Pass()); | 516 connection->SetSocket(transport_socket.Pass()); |
| 517 return socket_factory_->CreateSSLClientSocket( | 517 return socket_factory_->CreateSSLClientSocket( |
| 518 connection.Pass(), host_and_port, ssl_config, context_); | 518 connection.Pass(), host_and_port, ssl_config, NULL, context_); |
| 519 } | 519 } |
| 520 | 520 |
| 521 ClientSocketFactory* socket_factory_; | 521 ClientSocketFactory* socket_factory_; |
| 522 scoped_ptr<MockCertVerifier> cert_verifier_; | 522 scoped_ptr<MockCertVerifier> cert_verifier_; |
| 523 scoped_ptr<TransportSecurityState> transport_security_state_; | 523 scoped_ptr<TransportSecurityState> transport_security_state_; |
| 524 SSLClientSocketContext context_; | 524 SSLClientSocketContext context_; |
| 525 }; | 525 }; |
| 526 | 526 |
| 527 //----------------------------------------------------------------------------- | 527 //----------------------------------------------------------------------------- |
| 528 | 528 |
| (...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1533 rv = callback.WaitForResult(); | 1533 rv = callback.WaitForResult(); |
| 1534 EXPECT_EQ(OK, rv); | 1534 EXPECT_EQ(OK, rv); |
| 1535 | 1535 |
| 1536 scoped_ptr<ClientSocketHandle> socket_handle(new ClientSocketHandle()); | 1536 scoped_ptr<ClientSocketHandle> socket_handle(new ClientSocketHandle()); |
| 1537 socket_handle->SetSocket(transport.Pass()); | 1537 socket_handle->SetSocket(transport.Pass()); |
| 1538 | 1538 |
| 1539 scoped_ptr<SSLClientSocket> sock( | 1539 scoped_ptr<SSLClientSocket> sock( |
| 1540 socket_factory_->CreateSSLClientSocket(socket_handle.Pass(), | 1540 socket_factory_->CreateSSLClientSocket(socket_handle.Pass(), |
| 1541 test_server.host_port_pair(), | 1541 test_server.host_port_pair(), |
| 1542 kDefaultSSLConfig, | 1542 kDefaultSSLConfig, |
| 1543 NULL, |
| 1543 context_)); | 1544 context_)); |
| 1544 | 1545 |
| 1545 EXPECT_FALSE(sock->IsConnected()); | 1546 EXPECT_FALSE(sock->IsConnected()); |
| 1546 rv = sock->Connect(callback.callback()); | 1547 rv = sock->Connect(callback.callback()); |
| 1547 if (rv == ERR_IO_PENDING) | 1548 if (rv == ERR_IO_PENDING) |
| 1548 rv = callback.WaitForResult(); | 1549 rv = callback.WaitForResult(); |
| 1549 EXPECT_EQ(OK, rv); | 1550 EXPECT_EQ(OK, rv); |
| 1550 } | 1551 } |
| 1551 | 1552 |
| 1552 // Verifies that SSLClientSocket::ExportKeyingMaterial return a success | 1553 // Verifies that SSLClientSocket::ExportKeyingMaterial return a success |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 log.GetEntries(&entries); | 1947 log.GetEntries(&entries); |
| 1947 EXPECT_TRUE(LogContainsSSLConnectEndEvent(entries, -1)); | 1948 EXPECT_TRUE(LogContainsSSLConnectEndEvent(entries, -1)); |
| 1948 | 1949 |
| 1949 EXPECT_FALSE(sock->signed_cert_timestamps_received_); | 1950 EXPECT_FALSE(sock->signed_cert_timestamps_received_); |
| 1950 | 1951 |
| 1951 sock->Disconnect(); | 1952 sock->Disconnect(); |
| 1952 EXPECT_FALSE(sock->IsConnected()); | 1953 EXPECT_FALSE(sock->IsConnected()); |
| 1953 } | 1954 } |
| 1954 | 1955 |
| 1955 } // namespace net | 1956 } // namespace net |
| OLD | NEW |