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

Side by Side Diff: net/socket/ssl_client_socket_nss.h

Issue 8816002: SSLClientSocketNSS::ClearSessionCache should initialize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Add NET_EXPORT_PRIVATE Created 9 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/net.gyp ('k') | net/socket/ssl_client_socket_nss.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <certt.h> 9 #include <certt.h>
10 #include <keyt.h> 10 #include <keyt.h>
11 #include <nspr.h> 11 #include <nspr.h>
12 #include <nss.h> 12 #include <nss.h>
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/synchronization/lock.h" 18 #include "base/synchronization/lock.h"
19 #include "base/threading/platform_thread.h" 19 #include "base/threading/platform_thread.h"
20 #include "base/time.h" 20 #include "base/time.h"
21 #include "base/timer.h" 21 #include "base/timer.h"
22 #include "net/base/cert_verify_result.h" 22 #include "net/base/cert_verify_result.h"
23 #include "net/base/completion_callback.h" 23 #include "net/base/completion_callback.h"
24 #include "net/base/host_port_pair.h" 24 #include "net/base/host_port_pair.h"
25 #include "net/base/net_export.h"
25 #include "net/base/net_log.h" 26 #include "net/base/net_log.h"
26 #include "net/base/nss_memio.h" 27 #include "net/base/nss_memio.h"
27 #include "net/base/origin_bound_cert_service.h" 28 #include "net/base/origin_bound_cert_service.h"
28 #include "net/base/ssl_config_service.h" 29 #include "net/base/ssl_config_service.h"
29 #include "net/base/x509_certificate.h" 30 #include "net/base/x509_certificate.h"
30 #include "net/socket/ssl_client_socket.h" 31 #include "net/socket/ssl_client_socket.h"
31 32
32 namespace net { 33 namespace net {
33 34
34 class BoundNetLog; 35 class BoundNetLog;
(...skipping 14 matching lines...) Expand all
49 // authentication is requested, the host_and_port field of SSLCertRequestInfo 50 // authentication is requested, the host_and_port field of SSLCertRequestInfo
50 // will be populated with |host_and_port|. |ssl_config| specifies 51 // will be populated with |host_and_port|. |ssl_config| specifies
51 // the SSL settings. 52 // the SSL settings.
52 SSLClientSocketNSS(ClientSocketHandle* transport_socket, 53 SSLClientSocketNSS(ClientSocketHandle* transport_socket,
53 const HostPortPair& host_and_port, 54 const HostPortPair& host_and_port,
54 const SSLConfig& ssl_config, 55 const SSLConfig& ssl_config,
55 SSLHostInfo* ssl_host_info, 56 SSLHostInfo* ssl_host_info,
56 const SSLClientSocketContext& context); 57 const SSLClientSocketContext& context);
57 virtual ~SSLClientSocketNSS(); 58 virtual ~SSLClientSocketNSS();
58 59
59 // For tests 60 NET_EXPORT_PRIVATE static void ClearSessionCache();
60 static void ClearSessionCache();
61 61
62 // SSLClientSocket methods: 62 // SSLClientSocket methods:
63 virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; 63 virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
64 virtual void GetSSLCertRequestInfo( 64 virtual void GetSSLCertRequestInfo(
65 SSLCertRequestInfo* cert_request_info) OVERRIDE; 65 SSLCertRequestInfo* cert_request_info) OVERRIDE;
66 virtual int ExportKeyingMaterial(const base::StringPiece& label, 66 virtual int ExportKeyingMaterial(const base::StringPiece& label,
67 const base::StringPiece& context, 67 const base::StringPiece& context,
68 unsigned char *out, 68 unsigned char *out,
69 unsigned int outlen) OVERRIDE; 69 unsigned int outlen) OVERRIDE;
70 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; 70 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // Added the following code Debugging in release mode. 306 // Added the following code Debugging in release mode.
307 mutable base::Lock lock_; 307 mutable base::Lock lock_;
308 // This is mutable so that CalledOnValidThread can set it. 308 // This is mutable so that CalledOnValidThread can set it.
309 // It's guarded by |lock_|. 309 // It's guarded by |lock_|.
310 mutable base::PlatformThreadId valid_thread_id_; 310 mutable base::PlatformThreadId valid_thread_id_;
311 }; 311 };
312 312
313 } // namespace net 313 } // namespace net
314 314
315 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 315 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698