Chromium Code Reviews| OLD | NEW |
|---|---|
| 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.h" | 5 #include "net/socket/ssl_client_socket.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "crypto/ec_private_key.h" | 9 #include "crypto/ec_private_key.h" |
| 10 #include "net/socket/ssl_client_socket_openssl.h" | |
|
wtc
2014/06/17 17:44:39
Remove this.
mshelley1
2014/06/18 18:53:49
Done.
| |
| 10 #include "net/ssl/server_bound_cert_service.h" | 11 #include "net/ssl/server_bound_cert_service.h" |
| 11 #include "net/ssl/ssl_config_service.h" | 12 #include "net/ssl/ssl_config_service.h" |
| 12 | 13 |
| 13 namespace net { | 14 namespace net { |
| 14 | 15 |
| 15 SSLClientSocket::SSLClientSocket() | 16 SSLClientSocket::SSLClientSocket() |
| 16 : was_npn_negotiated_(false), | 17 : was_npn_negotiated_(false), |
| 17 was_spdy_negotiated_(false), | 18 was_spdy_negotiated_(false), |
| 18 protocol_negotiated_(kProtoUnknown), | 19 protocol_negotiated_(kProtoUnknown), |
| 19 channel_id_sent_(false), | 20 channel_id_sent_(false), |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 } | 97 } |
| 97 | 98 |
| 98 bool SSLClientSocket::WasNpnNegotiated() const { | 99 bool SSLClientSocket::WasNpnNegotiated() const { |
| 99 return was_npn_negotiated_; | 100 return was_npn_negotiated_; |
| 100 } | 101 } |
| 101 | 102 |
| 102 NextProto SSLClientSocket::GetNegotiatedProtocol() const { | 103 NextProto SSLClientSocket::GetNegotiatedProtocol() const { |
| 103 return protocol_negotiated_; | 104 return protocol_negotiated_; |
| 104 } | 105 } |
| 105 | 106 |
| 107 bool SSLClientSocket::InSessionCache() { | |
| 108 // We expect to invoke this method in the SSLClientSocketOpenSSL | |
| 109 NOTREACHED(); | |
| 110 return false; | |
| 111 } | |
| 112 | |
| 106 bool SSLClientSocket::IgnoreCertError(int error, int load_flags) { | 113 bool SSLClientSocket::IgnoreCertError(int error, int load_flags) { |
| 107 if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS) | 114 if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS) |
| 108 return true; | 115 return true; |
| 109 | 116 |
| 110 if (error == ERR_CERT_COMMON_NAME_INVALID && | 117 if (error == ERR_CERT_COMMON_NAME_INVALID && |
| 111 (load_flags & LOAD_IGNORE_CERT_COMMON_NAME_INVALID)) | 118 (load_flags & LOAD_IGNORE_CERT_COMMON_NAME_INVALID)) |
| 112 return true; | 119 return true; |
| 113 | 120 |
| 114 if (error == ERR_CERT_DATE_INVALID && | 121 if (error == ERR_CERT_DATE_INVALID && |
| 115 (load_flags & LOAD_IGNORE_CERT_DATE_INVALID)) | 122 (load_flags & LOAD_IGNORE_CERT_DATE_INVALID)) |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 204 } | 211 } |
| 205 if (!server_bound_cert_service->IsSystemTimeValid()) { | 212 if (!server_bound_cert_service->IsSystemTimeValid()) { |
| 206 DVLOG(1) << "System time is not within the supported range for certificate " | 213 DVLOG(1) << "System time is not within the supported range for certificate " |
| 207 "generation, not enabling channel ID."; | 214 "generation, not enabling channel ID."; |
| 208 return false; | 215 return false; |
| 209 } | 216 } |
| 210 return true; | 217 return true; |
| 211 } | 218 } |
| 212 | 219 |
| 213 } // namespace net | 220 } // namespace net |
| OLD | NEW |