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

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

Issue 2627143003: Remove message about TLS renegotiation info extension. (Closed)
Patch Set: Created 3 years, 11 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 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 ssl_info->security_bits = SSL_CIPHER_get_bits(cipher, NULL); 779 ssl_info->security_bits = SSL_CIPHER_get_bits(cipher, NULL);
780 // Historically, the "group" was known as "curve". 780 // Historically, the "group" was known as "curve".
781 ssl_info->key_exchange_group = SSL_get_curve_id(ssl_.get()); 781 ssl_info->key_exchange_group = SSL_get_curve_id(ssl_.get());
782 782
783 SSLConnectionStatusSetCipherSuite( 783 SSLConnectionStatusSetCipherSuite(
784 static_cast<uint16_t>(SSL_CIPHER_get_id(cipher)), 784 static_cast<uint16_t>(SSL_CIPHER_get_id(cipher)),
785 &ssl_info->connection_status); 785 &ssl_info->connection_status);
786 SSLConnectionStatusSetVersion(GetNetSSLVersion(ssl_.get()), 786 SSLConnectionStatusSetVersion(GetNetSSLVersion(ssl_.get()),
787 &ssl_info->connection_status); 787 &ssl_info->connection_status);
788 788
789 if (!SSL_get_secure_renegotiation_support(ssl_.get()))
790 ssl_info->connection_status |= SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION;
791
792 ssl_info->handshake_type = SSL_session_reused(ssl_.get()) 789 ssl_info->handshake_type = SSL_session_reused(ssl_.get())
793 ? SSLInfo::HANDSHAKE_RESUME 790 ? SSLInfo::HANDSHAKE_RESUME
794 : SSLInfo::HANDSHAKE_FULL; 791 : SSLInfo::HANDSHAKE_FULL;
795 792
796 return true; 793 return true;
797 } 794 }
798 795
799 void SSLClientSocketImpl::GetConnectionAttempts(ConnectionAttempts* out) const { 796 void SSLClientSocketImpl::GetConnectionAttempts(ConnectionAttempts* out) const {
800 out->clear(); 797 out->clear();
801 } 798 }
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED && 2042 if (ERR_GET_REASON(info->error_code) == SSL_R_TLSV1_ALERT_ACCESS_DENIED &&
2046 !certificate_requested_) { 2043 !certificate_requested_) {
2047 net_error = ERR_SSL_PROTOCOL_ERROR; 2044 net_error = ERR_SSL_PROTOCOL_ERROR;
2048 } 2045 }
2049 } 2046 }
2050 2047
2051 return net_error; 2048 return net_error;
2052 } 2049 }
2053 2050
2054 } // namespace net 2051 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698