OLD | NEW |
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> |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 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, |
| 71 std::string* server_protos) OVERRIDE; |
71 | 72 |
72 // StreamSocket methods: | 73 // StreamSocket methods: |
73 virtual int Connect(OldCompletionCallback* callback) OVERRIDE; | 74 virtual int Connect(OldCompletionCallback* callback) OVERRIDE; |
74 virtual void Disconnect() OVERRIDE; | 75 virtual void Disconnect() OVERRIDE; |
75 virtual bool IsConnected() const OVERRIDE; | 76 virtual bool IsConnected() const OVERRIDE; |
76 virtual bool IsConnectedAndIdle() const OVERRIDE; | 77 virtual bool IsConnectedAndIdle() const OVERRIDE; |
77 virtual int GetPeerAddress(AddressList* address) const OVERRIDE; | 78 virtual int GetPeerAddress(AddressList* address) const OVERRIDE; |
78 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; | 79 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; |
79 virtual const BoundNetLog& NetLog() const OVERRIDE; | 80 virtual const BoundNetLog& NetLog() const OVERRIDE; |
80 virtual void SetSubresourceSpeculation() OVERRIDE; | 81 virtual void SetSubresourceSpeculation() OVERRIDE; |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 BoundNetLog net_log_; | 294 BoundNetLog net_log_; |
294 | 295 |
295 base::TimeTicks start_cert_verification_time_; | 296 base::TimeTicks start_cert_verification_time_; |
296 | 297 |
297 scoped_ptr<SSLHostInfo> ssl_host_info_; | 298 scoped_ptr<SSLHostInfo> ssl_host_info_; |
298 DnsCertProvenanceChecker* const dns_cert_checker_; | 299 DnsCertProvenanceChecker* const dns_cert_checker_; |
299 | 300 |
300 // next_proto_ is the protocol that we selected by NPN. | 301 // next_proto_ is the protocol that we selected by NPN. |
301 std::string next_proto_; | 302 std::string next_proto_; |
302 NextProtoStatus next_proto_status_; | 303 NextProtoStatus next_proto_status_; |
| 304 // Server's NPN advertised protocols. |
| 305 std::string server_protos_; |
303 | 306 |
304 // The following two variables are added for debugging bug 65948. Will | 307 // The following two variables are added for debugging bug 65948. Will |
305 // remove this code after fixing bug 65948. | 308 // remove this code after fixing bug 65948. |
306 // Added the following code Debugging in release mode. | 309 // Added the following code Debugging in release mode. |
307 mutable base::Lock lock_; | 310 mutable base::Lock lock_; |
308 // This is mutable so that CalledOnValidThread can set it. | 311 // This is mutable so that CalledOnValidThread can set it. |
309 // It's guarded by |lock_|. | 312 // It's guarded by |lock_|. |
310 mutable base::PlatformThreadId valid_thread_id_; | 313 mutable base::PlatformThreadId valid_thread_id_; |
311 }; | 314 }; |
312 | 315 |
313 } // namespace net | 316 } // namespace net |
314 | 317 |
315 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ | 318 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ |
OLD | NEW |