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_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 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1714 void SSLClientSocketImpl::AddCTInfoToSSLInfo(SSLInfo* ssl_info) const { | 1714 void SSLClientSocketImpl::AddCTInfoToSSLInfo(SSLInfo* ssl_info) const { |
1715 ssl_info->UpdateCertificateTransparencyInfo(ct_verify_result_); | 1715 ssl_info->UpdateCertificateTransparencyInfo(ct_verify_result_); |
1716 } | 1716 } |
1717 | 1717 |
1718 std::string SSLClientSocketImpl::GetSessionCacheKey() const { | 1718 std::string SSLClientSocketImpl::GetSessionCacheKey() const { |
1719 std::string result = host_and_port_.ToString(); | 1719 std::string result = host_and_port_.ToString(); |
1720 result.push_back('/'); | 1720 result.push_back('/'); |
1721 result.append(ssl_session_cache_shard_); | 1721 result.append(ssl_session_cache_shard_); |
1722 | 1722 |
1723 result.push_back('/'); | 1723 result.push_back('/'); |
1724 result.push_back(ssl_config_.deprecated_cipher_suites_enabled ? '1' : '0'); | |
1725 result.push_back(ssl_config_.channel_id_enabled ? '1' : '0'); | 1724 result.push_back(ssl_config_.channel_id_enabled ? '1' : '0'); |
1726 result.push_back(ssl_config_.version_interference_probe ? '1' : '0'); | 1725 result.push_back(ssl_config_.version_interference_probe ? '1' : '0'); |
1727 return result; | 1726 return result; |
1728 } | 1727 } |
1729 | 1728 |
1730 bool SSLClientSocketImpl::IsRenegotiationAllowed() const { | 1729 bool SSLClientSocketImpl::IsRenegotiationAllowed() const { |
1731 if (tb_was_negotiated_) | 1730 if (tb_was_negotiated_) |
1732 return false; | 1731 return false; |
1733 | 1732 |
1734 if (negotiated_protocol_ == kProtoUnknown) | 1733 if (negotiated_protocol_ == kProtoUnknown) |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1979 if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED && | 1978 if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED && |
1980 !certificate_requested_) { | 1979 !certificate_requested_) { |
1981 net_error = ERR_SSL_PROTOCOL_ERROR; | 1980 net_error = ERR_SSL_PROTOCOL_ERROR; |
1982 } | 1981 } |
1983 } | 1982 } |
1984 | 1983 |
1985 return net_error; | 1984 return net_error; |
1986 } | 1985 } |
1987 | 1986 |
1988 } // namespace net | 1987 } // namespace net |
OLD | NEW |