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

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

Issue 2095823002: Make DCHECKs into CHECKs for CT policy code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « net/quic/crypto/proof_verifier_chromium.cc ('k') | no next file » | 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 #include "net/socket/ssl_client_socket_impl.h" 5 #include "net/socket/ssl_client_socket_impl.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <openssl/bio.h> 8 #include <openssl/bio.h>
9 #include <openssl/bytestring.h> 9 #include <openssl/bytestring.h>
10 #include <openssl/err.h> 10 #include <openssl/err.h>
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 channel_id_sent_(false), 511 channel_id_sent_(false),
512 session_pending_(false), 512 session_pending_(false),
513 certificate_verified_(false), 513 certificate_verified_(false),
514 ssl_failure_state_(SSL_FAILURE_NONE), 514 ssl_failure_state_(SSL_FAILURE_NONE),
515 signature_result_(kNoPendingResult), 515 signature_result_(kNoPendingResult),
516 transport_security_state_(context.transport_security_state), 516 transport_security_state_(context.transport_security_state),
517 policy_enforcer_(context.ct_policy_enforcer), 517 policy_enforcer_(context.ct_policy_enforcer),
518 pkp_bypassed_(false), 518 pkp_bypassed_(false),
519 net_log_(transport_->socket()->NetLog()), 519 net_log_(transport_->socket()->NetLog()),
520 weak_factory_(this) { 520 weak_factory_(this) {
521 DCHECK(cert_verifier_); 521 CHECK(cert_verifier_);
522 DCHECK(transport_security_state_); 522 CHECK(transport_security_state_);
523 DCHECK(policy_enforcer_); 523 CHECK(cert_transparency_verifier_);
524 CHECK(policy_enforcer_);
524 } 525 }
525 526
526 SSLClientSocketImpl::~SSLClientSocketImpl() { 527 SSLClientSocketImpl::~SSLClientSocketImpl() {
527 Disconnect(); 528 Disconnect();
528 } 529 }
529 530
530 #if !defined(OS_NACL) 531 #if !defined(OS_NACL)
531 void SSLClientSocketImpl::SetSSLKeyLogFile( 532 void SSLClientSocketImpl::SetSSLKeyLogFile(
532 const base::FilePath& ssl_keylog_file, 533 const base::FilePath& ssl_keylog_file,
533 const scoped_refptr<base::SequencedTaskRunner>& task_runner) { 534 const scoped_refptr<base::SequencedTaskRunner>& task_runner) {
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after
2313 if (rv != OK) { 2314 if (rv != OK) {
2314 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); 2315 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
2315 return; 2316 return;
2316 } 2317 }
2317 2318
2318 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, 2319 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT,
2319 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); 2320 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this)));
2320 } 2321 }
2321 2322
2322 } // namespace net 2323 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/proof_verifier_chromium.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698