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

Side by Side Diff: net/socket/ssl_server_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_server_socket_impl.h" 5 #include "net/socket/ssl_server_socket_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_.get()); 348 const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_.get());
349 CHECK(cipher); 349 CHECK(cipher);
350 ssl_info->security_bits = SSL_CIPHER_get_bits(cipher, NULL); 350 ssl_info->security_bits = SSL_CIPHER_get_bits(cipher, NULL);
351 351
352 SSLConnectionStatusSetCipherSuite( 352 SSLConnectionStatusSetCipherSuite(
353 static_cast<uint16_t>(SSL_CIPHER_get_id(cipher)), 353 static_cast<uint16_t>(SSL_CIPHER_get_id(cipher)),
354 &ssl_info->connection_status); 354 &ssl_info->connection_status);
355 SSLConnectionStatusSetVersion(GetNetSSLVersion(ssl_.get()), 355 SSLConnectionStatusSetVersion(GetNetSSLVersion(ssl_.get()),
356 &ssl_info->connection_status); 356 &ssl_info->connection_status);
357 357
358 if (!SSL_get_secure_renegotiation_support(ssl_.get()))
359 ssl_info->connection_status |= SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION;
360
361 ssl_info->handshake_type = SSL_session_reused(ssl_.get()) 358 ssl_info->handshake_type = SSL_session_reused(ssl_.get())
362 ? SSLInfo::HANDSHAKE_RESUME 359 ? SSLInfo::HANDSHAKE_RESUME
363 : SSLInfo::HANDSHAKE_FULL; 360 : SSLInfo::HANDSHAKE_FULL;
364 361
365 return true; 362 return true;
366 } 363 }
367 364
368 void SSLServerSocketImpl::GetConnectionAttempts(ConnectionAttempts* out) const { 365 void SSLServerSocketImpl::GetConnectionAttempts(ConnectionAttempts* out) const {
369 out->clear(); 366 out->clear();
370 } 367 }
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 SSLServerContextImpl::~SSLServerContextImpl() {} 730 SSLServerContextImpl::~SSLServerContextImpl() {}
734 731
735 std::unique_ptr<SSLServerSocket> SSLServerContextImpl::CreateSSLServerSocket( 732 std::unique_ptr<SSLServerSocket> SSLServerContextImpl::CreateSSLServerSocket(
736 std::unique_ptr<StreamSocket> socket) { 733 std::unique_ptr<StreamSocket> socket) {
737 bssl::UniquePtr<SSL> ssl(SSL_new(ssl_ctx_.get())); 734 bssl::UniquePtr<SSL> ssl(SSL_new(ssl_ctx_.get()));
738 return std::unique_ptr<SSLServerSocket>( 735 return std::unique_ptr<SSLServerSocket>(
739 new SSLServerSocketImpl(std::move(socket), std::move(ssl))); 736 new SSLServerSocketImpl(std::move(socket), std::move(ssl)));
740 } 737 }
741 738
742 } // namespace net 739 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698