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

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

Issue 2189613003: Stop calling SSL_get_session in SSLClientSocketImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_impl.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_IMPL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
7 7
8 #include <openssl/base.h> 8 #include <openssl/base.h>
9 #include <openssl/ssl.h> 9 #include <openssl/ssl.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 10 matching lines...) Expand all
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "net/base/completion_callback.h" 22 #include "net/base/completion_callback.h"
23 #include "net/base/io_buffer.h" 23 #include "net/base/io_buffer.h"
24 #include "net/cert/cert_verifier.h" 24 #include "net/cert/cert_verifier.h"
25 #include "net/cert/cert_verify_result.h" 25 #include "net/cert/cert_verify_result.h"
26 #include "net/cert/ct_verify_result.h" 26 #include "net/cert/ct_verify_result.h"
27 #include "net/socket/client_socket_handle.h" 27 #include "net/socket/client_socket_handle.h"
28 #include "net/socket/ssl_client_socket.h" 28 #include "net/socket/ssl_client_socket.h"
29 #include "net/ssl/channel_id_service.h" 29 #include "net/ssl/channel_id_service.h"
30 #include "net/ssl/openssl_ssl_util.h" 30 #include "net/ssl/openssl_ssl_util.h"
31 #include "net/ssl/scoped_openssl_types.h"
31 #include "net/ssl/ssl_client_cert_type.h" 32 #include "net/ssl/ssl_client_cert_type.h"
32 #include "net/ssl/ssl_config_service.h" 33 #include "net/ssl/ssl_config_service.h"
33 34
34 namespace base { 35 namespace base {
35 class FilePath; 36 class FilePath;
36 class SequencedTaskRunner; 37 class SequencedTaskRunner;
37 } 38 }
38 39
39 namespace net { 40 namespace net {
40 41
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 339
339 // True if the socket has been disconnected. 340 // True if the socket has been disconnected.
340 bool disconnected_; 341 bool disconnected_;
341 342
342 NextProtoStatus npn_status_; 343 NextProtoStatus npn_status_;
343 std::string npn_proto_; 344 std::string npn_proto_;
344 // Written by the |channel_id_service_|. 345 // Written by the |channel_id_service_|.
345 std::unique_ptr<crypto::ECPrivateKey> channel_id_key_; 346 std::unique_ptr<crypto::ECPrivateKey> channel_id_key_;
346 // True if a channel ID was sent. 347 // True if a channel ID was sent.
347 bool channel_id_sent_; 348 bool channel_id_sent_;
348 // True if the current session was newly-established, but the certificate had 349 // If non-null, the newly-established to be inserted into the session cache
349 // not yet been verified externally, so it cannot be inserted into the cache 350 // once certificate verification is done.
350 // until later. 351 ScopedSSL_SESSION pending_session_;
351 bool session_pending_;
352 // True if the initial handshake's certificate has been verified. 352 // True if the initial handshake's certificate has been verified.
353 bool certificate_verified_; 353 bool certificate_verified_;
354 // The request handle for |channel_id_service_|. 354 // The request handle for |channel_id_service_|.
355 ChannelIDService::Request channel_id_request_; 355 ChannelIDService::Request channel_id_request_;
356 356
357 int signature_result_; 357 int signature_result_;
358 std::vector<uint8_t> signature_; 358 std::vector<uint8_t> signature_;
359 359
360 TransportSecurityState* transport_security_state_; 360 TransportSecurityState* transport_security_state_;
361 361
362 CTPolicyEnforcer* const policy_enforcer_; 362 CTPolicyEnforcer* const policy_enforcer_;
363 363
364 // pinning_failure_log contains a message produced by 364 // pinning_failure_log contains a message produced by
365 // TransportSecurityState::CheckPublicKeyPins in the event of a 365 // TransportSecurityState::CheckPublicKeyPins in the event of a
366 // pinning failure. It is a (somewhat) human-readable string. 366 // pinning failure. It is a (somewhat) human-readable string.
367 std::string pinning_failure_log_; 367 std::string pinning_failure_log_;
368 368
369 // True if PKP is bypassed due to a local trust anchor. 369 // True if PKP is bypassed due to a local trust anchor.
370 bool pkp_bypassed_; 370 bool pkp_bypassed_;
371 371
372 BoundNetLog net_log_; 372 BoundNetLog net_log_;
373 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_; 373 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
374 }; 374 };
375 375
376 } // namespace net 376 } // namespace net
377 377
378 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 378 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698