| 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 #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 | 7 |
| 8 #include <certt.h> | 8 #include <certt.h> |
| 9 #include <keyt.h> | 9 #include <keyt.h> |
| 10 #include <nspr.h> | 10 #include <nspr.h> |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 // The following methods are for debugging bug 65948. Will remove this code | 139 // The following methods are for debugging bug 65948. Will remove this code |
| 140 // after fixing bug 65948. | 140 // after fixing bug 65948. |
| 141 void EnsureThreadIdAssigned() const; | 141 void EnsureThreadIdAssigned() const; |
| 142 bool CalledOnValidThread() const; | 142 bool CalledOnValidThread() const; |
| 143 | 143 |
| 144 // Adds the SignedCertificateTimestamps from ct_verify_result_ to |ssl_info|. | 144 // Adds the SignedCertificateTimestamps from ct_verify_result_ to |ssl_info|. |
| 145 // SCTs are held in three separate vectors in ct_verify_result, each | 145 // SCTs are held in three separate vectors in ct_verify_result, each |
| 146 // vetor representing a particular verification state, this method associates | 146 // vetor representing a particular verification state, this method associates |
| 147 // each of the SCTs with the corresponding SCTVerifyStatus as it adds it to | 147 // each of the SCTs with the corresponding SCTVerifyStatus as it adds it to |
| 148 // the |ssl_info|.signed_certificate_timestamps list. | 148 // the |ssl_info|.signed_certificate_timestamps list. |
| 149 void AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const; | 149 void AddCTInfoToSSLInfo(SSLInfo* ssl_info) const; |
| 150 | 150 |
| 151 // Move last protocol to first place: SSLConfig::next_protos has protocols in | 151 // Move last protocol to first place: SSLConfig::next_protos has protocols in |
| 152 // decreasing order of preference with NPN fallback protocol at the end, but | 152 // decreasing order of preference with NPN fallback protocol at the end, but |
| 153 // NSS moves the first one to the last place before sending them in ALPN, and | 153 // NSS moves the first one to the last place before sending them in ALPN, and |
| 154 // uses the first one as a fallback for NPN. | 154 // uses the first one as a fallback for NPN. |
| 155 static void ReorderNextProtos(NextProtoVector* next_protos); | 155 static void ReorderNextProtos(NextProtoVector* next_protos); |
| 156 | 156 |
| 157 scoped_ptr<ClientSocketHandle> transport_; | 157 scoped_ptr<ClientSocketHandle> transport_; |
| 158 HostPortPair host_and_port_; | 158 HostPortPair host_and_port_; |
| 159 SSLConfig ssl_config_; | 159 SSLConfig ssl_config_; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 // Added the following code Debugging in release mode. | 210 // Added the following code Debugging in release mode. |
| 211 mutable base::Lock lock_; | 211 mutable base::Lock lock_; |
| 212 // This is mutable so that CalledOnValidThread can set it. | 212 // This is mutable so that CalledOnValidThread can set it. |
| 213 // It's guarded by |lock_|. | 213 // It's guarded by |lock_|. |
| 214 mutable base::PlatformThreadId valid_thread_id_; | 214 mutable base::PlatformThreadId valid_thread_id_; |
| 215 }; | 215 }; |
| 216 | 216 |
| 217 } // namespace net | 217 } // namespace net |
| 218 | 218 |
| 219 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ | 219 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ |
| OLD | NEW |