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

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

Issue 2850033002: Check Expect-CT at connection setup (Closed)
Patch Set: fix CanPool check Created 3 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
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 <string.h> 8 #include <string.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1569 ct_verify_result_.cert_policy_compliance = 1569 ct_verify_result_.cert_policy_compliance =
1570 policy_enforcer_->DoesConformToCertPolicy( 1570 policy_enforcer_->DoesConformToCertPolicy(
1571 server_cert_verify_result_.verified_cert.get(), verified_scts, 1571 server_cert_verify_result_.verified_cert.get(), verified_scts,
1572 net_log_); 1572 net_log_);
1573 1573
1574 if (ct_verify_result_.cert_policy_compliance != 1574 if (ct_verify_result_.cert_policy_compliance !=
1575 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && 1575 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS &&
1576 ct_verify_result_.cert_policy_compliance != 1576 ct_verify_result_.cert_policy_compliance !=
1577 ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && 1577 ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY &&
1578 transport_security_state_->ShouldRequireCT( 1578 transport_security_state_->ShouldRequireCT(
1579 host_and_port_.host(), server_cert_verify_result_.verified_cert.get(), 1579 host_and_port_, server_cert_verify_result_.is_issued_by_known_root,
1580 server_cert_verify_result_.public_key_hashes)) { 1580 server_cert_verify_result_.public_key_hashes,
1581 server_cert_verify_result_.verified_cert.get(), server_cert_.get(),
1582 ct_verify_result_.scts,
1583 TransportSecurityState::ENABLE_EXPECT_CT_REPORTS)) {
1581 server_cert_verify_result_.cert_status |= 1584 server_cert_verify_result_.cert_status |=
1582 CERT_STATUS_CERTIFICATE_TRANSPARENCY_REQUIRED; 1585 CERT_STATUS_CERTIFICATE_TRANSPARENCY_REQUIRED;
1583 return ERR_CERTIFICATE_TRANSPARENCY_REQUIRED; 1586 return ERR_CERTIFICATE_TRANSPARENCY_REQUIRED;
1584 } 1587 }
1585 1588
1586 return OK; 1589 return OK;
1587 } 1590 }
1588 1591
1589 int SSLClientSocketImpl::ClientCertRequestCallback(SSL* ssl) { 1592 int SSLClientSocketImpl::ClientCertRequestCallback(SSL* ssl) {
1590 DCHECK(ssl == ssl_.get()); 1593 DCHECK(ssl == ssl_.get());
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1982 if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED && 1985 if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED &&
1983 !certificate_requested_) { 1986 !certificate_requested_) {
1984 net_error = ERR_SSL_PROTOCOL_ERROR; 1987 net_error = ERR_SSL_PROTOCOL_ERROR;
1985 } 1988 }
1986 } 1989 }
1987 1990
1988 return net_error; 1991 return net_error;
1989 } 1992 }
1990 1993
1991 } // namespace net 1994 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698