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

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

Issue 10392166: Removed unreached code related to ESET MITM detection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months 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 | « no previous file | 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) 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 #pragma once 7 #pragma once
8 8
9 #include <certt.h> 9 #include <certt.h>
10 #include <keyt.h> 10 #include <keyt.h>
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 bool handshake_callback_called_; 266 bool handshake_callback_called_;
267 267
268 // True if the SSL handshake has been completed. 268 // True if the SSL handshake has been completed.
269 bool completed_handshake_; 269 bool completed_handshake_;
270 270
271 // ssl_session_cache_shard_ is an opaque string that partitions the SSL 271 // ssl_session_cache_shard_ is an opaque string that partitions the SSL
272 // session cache. i.e. sessions created with one value will not attempt to 272 // session cache. i.e. sessions created with one value will not attempt to
273 // resume on the socket with a different value. 273 // resume on the socket with a different value.
274 const std::string ssl_session_cache_shard_; 274 const std::string ssl_session_cache_shard_;
275 275
276 // True iff we believe that the user has an ESET product intercepting our
277 // HTTPS connections.
278 bool eset_mitm_detected_;
279
280 // True iff |ssl_host_info_| contained a predicted certificate chain and 276 // True iff |ssl_host_info_| contained a predicted certificate chain and
281 // that we found the prediction to be correct. 277 // that we found the prediction to be correct.
282 bool predicted_cert_chain_correct_; 278 bool predicted_cert_chain_correct_;
283 279
284 State next_handshake_state_; 280 State next_handshake_state_;
285 281
286 // The NSS SSL state machine 282 // The NSS SSL state machine
287 PRFileDesc* nss_fd_; 283 PRFileDesc* nss_fd_;
288 284
289 // Buffers for the network end of the SSL state machine 285 // Buffers for the network end of the SSL state machine
(...skipping 18 matching lines...) Expand all
308 // Added the following code Debugging in release mode. 304 // Added the following code Debugging in release mode.
309 mutable base::Lock lock_; 305 mutable base::Lock lock_;
310 // This is mutable so that CalledOnValidThread can set it. 306 // This is mutable so that CalledOnValidThread can set it.
311 // It's guarded by |lock_|. 307 // It's guarded by |lock_|.
312 mutable base::PlatformThreadId valid_thread_id_; 308 mutable base::PlatformThreadId valid_thread_id_;
313 }; 309 };
314 310
315 } // namespace net 311 } // namespace net
316 312
317 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 313 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698