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

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

Issue 5386001: Cache certificate verification results in memory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before checkin Created 10 years 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
« no previous file with comments | « net/socket/client_socket_factory.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/client_socket_factory.h" 5 #include "net/socket/client_socket_factory.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "net/socket/client_socket_handle.h" 9 #include "net/socket/client_socket_handle.h"
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 12 matching lines...) Expand all
23 23
24 class DnsCertProvenanceChecker; 24 class DnsCertProvenanceChecker;
25 25
26 namespace { 26 namespace {
27 27
28 SSLClientSocket* DefaultSSLClientSocketFactory( 28 SSLClientSocket* DefaultSSLClientSocketFactory(
29 ClientSocketHandle* transport_socket, 29 ClientSocketHandle* transport_socket,
30 const HostPortPair& host_and_port, 30 const HostPortPair& host_and_port,
31 const SSLConfig& ssl_config, 31 const SSLConfig& ssl_config,
32 SSLHostInfo* ssl_host_info, 32 SSLHostInfo* ssl_host_info,
33 CertVerifier* cert_verifier,
33 DnsCertProvenanceChecker* dns_cert_checker) { 34 DnsCertProvenanceChecker* dns_cert_checker) {
34 scoped_ptr<SSLHostInfo> shi(ssl_host_info); 35 scoped_ptr<SSLHostInfo> shi(ssl_host_info);
35 #if defined(OS_WIN) 36 #if defined(OS_WIN)
36 return new SSLClientSocketWin(transport_socket, host_and_port, ssl_config); 37 return new SSLClientSocketWin(transport_socket, host_and_port, ssl_config,
38 cert_verifier);
37 #elif defined(USE_OPENSSL) 39 #elif defined(USE_OPENSSL)
38 return new SSLClientSocketOpenSSL(transport_socket, host_and_port, 40 return new SSLClientSocketOpenSSL(transport_socket, host_and_port,
39 ssl_config); 41 ssl_config, cert_verifier);
40 #elif defined(USE_NSS) 42 #elif defined(USE_NSS)
41 return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config, 43 return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config,
42 shi.release(), dns_cert_checker); 44 shi.release(), cert_verifier, dns_cert_checker);
43 #elif defined(OS_MACOSX) 45 #elif defined(OS_MACOSX)
44 return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config, 46 return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config,
45 shi.release(), dns_cert_checker); 47 shi.release(), cert_verifier, dns_cert_checker);
46 #else 48 #else
47 NOTIMPLEMENTED(); 49 NOTIMPLEMENTED();
48 return NULL; 50 return NULL;
49 #endif 51 #endif
50 } 52 }
51 53
52 SSLClientSocketFactory g_ssl_factory = DefaultSSLClientSocketFactory; 54 SSLClientSocketFactory g_ssl_factory = DefaultSSLClientSocketFactory;
53 55
54 class DefaultClientSocketFactory : public ClientSocketFactory { 56 class DefaultClientSocketFactory : public ClientSocketFactory {
55 public: 57 public:
56 virtual ClientSocket* CreateTCPClientSocket( 58 virtual ClientSocket* CreateTCPClientSocket(
57 const AddressList& addresses, 59 const AddressList& addresses,
58 NetLog* net_log, 60 NetLog* net_log,
59 const NetLog::Source& source) { 61 const NetLog::Source& source) {
60 return new TCPClientSocket(addresses, net_log, source); 62 return new TCPClientSocket(addresses, net_log, source);
61 } 63 }
62 64
63 virtual SSLClientSocket* CreateSSLClientSocket( 65 virtual SSLClientSocket* CreateSSLClientSocket(
64 ClientSocketHandle* transport_socket, 66 ClientSocketHandle* transport_socket,
65 const HostPortPair& host_and_port, 67 const HostPortPair& host_and_port,
66 const SSLConfig& ssl_config, 68 const SSLConfig& ssl_config,
67 SSLHostInfo* ssl_host_info, 69 SSLHostInfo* ssl_host_info,
70 CertVerifier* cert_verifier,
68 DnsCertProvenanceChecker* dns_cert_checker) { 71 DnsCertProvenanceChecker* dns_cert_checker) {
69 return g_ssl_factory(transport_socket, host_and_port, ssl_config, 72 return g_ssl_factory(transport_socket, host_and_port, ssl_config,
70 ssl_host_info, dns_cert_checker); 73 ssl_host_info, cert_verifier, dns_cert_checker);
71 } 74 }
72 }; 75 };
73 76
74 static base::LazyInstance<DefaultClientSocketFactory> 77 static base::LazyInstance<DefaultClientSocketFactory>
75 g_default_client_socket_factory(base::LINKER_INITIALIZED); 78 g_default_client_socket_factory(base::LINKER_INITIALIZED);
76 79
77 } // namespace 80 } // namespace
78 81
79 // static 82 // static
80 ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() { 83 ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
81 return g_default_client_socket_factory.Pointer(); 84 return g_default_client_socket_factory.Pointer();
82 } 85 }
83 86
84 // static 87 // static
85 void ClientSocketFactory::SetSSLClientSocketFactory( 88 void ClientSocketFactory::SetSSLClientSocketFactory(
86 SSLClientSocketFactory factory) { 89 SSLClientSocketFactory factory) {
87 g_ssl_factory = factory; 90 g_ssl_factory = factory;
88 } 91 }
89 92
90 // Deprecated function (http://crbug.com/37810) that takes a ClientSocket. 93 // Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
91 SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket( 94 SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
92 ClientSocket* transport_socket, 95 ClientSocket* transport_socket,
93 const HostPortPair& host_and_port, 96 const HostPortPair& host_and_port,
94 const SSLConfig& ssl_config, 97 const SSLConfig& ssl_config,
95 SSLHostInfo* ssl_host_info) { 98 SSLHostInfo* ssl_host_info,
99 CertVerifier* cert_verifier) {
96 ClientSocketHandle* socket_handle = new ClientSocketHandle(); 100 ClientSocketHandle* socket_handle = new ClientSocketHandle();
97 socket_handle->set_socket(transport_socket); 101 socket_handle->set_socket(transport_socket);
98 return CreateSSLClientSocket(socket_handle, host_and_port, ssl_config, 102 return CreateSSLClientSocket(socket_handle, host_and_port, ssl_config,
99 ssl_host_info, 103 ssl_host_info, cert_verifier,
100 NULL /* DnsCertProvenanceChecker */); 104 NULL /* DnsCertProvenanceChecker */);
101 } 105 }
102 106
103 } // namespace net 107 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_factory.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698