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

Side by Side Diff: net/ssl/ssl_config.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/ssl/ssl_config.h ('k') | net/ssl/ssl_config_service.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ssl/ssl_config.h" 5 #include "net/ssl/ssl_config.h"
6 6
7 #include "net/socket/ssl_client_socket.h" 7 #include "net/socket/ssl_client_socket.h"
8 8
9 namespace net { 9 namespace net {
10 10
(...skipping 11 matching lines...) Expand all
22 version_min(kDefaultSSLVersionMin), 22 version_min(kDefaultSSLVersionMin),
23 version_max(SSLClientSocket::GetMaxSupportedSSLVersion()), 23 version_max(SSLClientSocket::GetMaxSupportedSSLVersion()),
24 version_fallback_min(kDefaultSSLVersionFallbackMin), 24 version_fallback_min(kDefaultSSLVersionFallbackMin),
25 channel_id_enabled(true), 25 channel_id_enabled(true),
26 false_start_enabled(true), 26 false_start_enabled(true),
27 signed_cert_timestamps_enabled(true), 27 signed_cert_timestamps_enabled(true),
28 require_forward_secrecy(false), 28 require_forward_secrecy(false),
29 send_client_cert(false), 29 send_client_cert(false),
30 verify_ev_cert(false), 30 verify_ev_cert(false),
31 version_fallback(false), 31 version_fallback(false),
32 cert_io_enabled(true) { 32 cert_io_enabled(true),
33 fastradio_padding_enabled(false),
34 fastradio_padding_eligible(false) {
33 } 35 }
34 36
35 SSLConfig::~SSLConfig() {} 37 SSLConfig::~SSLConfig() {}
36 38
37 bool SSLConfig::IsAllowedBadCert(X509Certificate* cert, 39 bool SSLConfig::IsAllowedBadCert(X509Certificate* cert,
38 CertStatus* cert_status) const { 40 CertStatus* cert_status) const {
39 std::string der_cert; 41 std::string der_cert;
40 if (!X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_cert)) 42 if (!X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_cert))
41 return false; 43 return false;
42 return IsAllowedBadCert(der_cert, cert_status); 44 return IsAllowedBadCert(der_cert, cert_status);
43 } 45 }
44 46
45 bool SSLConfig::IsAllowedBadCert(const base::StringPiece& der_cert, 47 bool SSLConfig::IsAllowedBadCert(const base::StringPiece& der_cert,
46 CertStatus* cert_status) const { 48 CertStatus* cert_status) const {
47 for (size_t i = 0; i < allowed_bad_certs.size(); ++i) { 49 for (size_t i = 0; i < allowed_bad_certs.size(); ++i) {
48 if (der_cert == allowed_bad_certs[i].der_cert) { 50 if (der_cert == allowed_bad_certs[i].der_cert) {
49 if (cert_status) 51 if (cert_status)
50 *cert_status = allowed_bad_certs[i].cert_status; 52 *cert_status = allowed_bad_certs[i].cert_status;
51 return true; 53 return true;
52 } 54 }
53 } 55 }
54 return false; 56 return false;
55 } 57 }
56 58
57 } // namespace net 59 } // namespace net
OLDNEW
« no previous file with comments | « net/ssl/ssl_config.h ('k') | net/ssl/ssl_config_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698