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

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

Issue 1096203006: Collect all ConnectionAttempts from both sockets in TransportConnectJob. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@domrel_serverip1
Patch Set: Make requested changes; rebase Created 5 years, 7 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 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
6 // from AuthCertificateCallback() in 6 // from AuthCertificateCallback() in
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
8 8
9 /* ***** BEGIN LICENSE BLOCK ***** 9 /* ***** BEGIN LICENSE BLOCK *****
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
(...skipping 2478 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 << " for cipherSuite " << cipher_suite; 2489 << " for cipherSuite " << cipher_suite;
2490 } 2490 }
2491 2491
2492 ssl_info->handshake_type = core_->state().resumed_handshake ? 2492 ssl_info->handshake_type = core_->state().resumed_handshake ?
2493 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; 2493 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL;
2494 2494
2495 LeaveFunction(""); 2495 LeaveFunction("");
2496 return true; 2496 return true;
2497 } 2497 }
2498 2498
2499 void SSLClientSocketNSS::GetConnectionAttempts(ConnectionAttempts* out) const {
2500 out->clear();
2501 }
2502
2499 void SSLClientSocketNSS::GetSSLCertRequestInfo( 2503 void SSLClientSocketNSS::GetSSLCertRequestInfo(
2500 SSLCertRequestInfo* cert_request_info) { 2504 SSLCertRequestInfo* cert_request_info) {
2501 EnterFunction(""); 2505 EnterFunction("");
2502 cert_request_info->host_and_port = host_and_port_; 2506 cert_request_info->host_and_port = host_and_port_;
2503 cert_request_info->cert_authorities = core_->state().cert_authorities; 2507 cert_request_info->cert_authorities = core_->state().cert_authorities;
2504 LeaveFunction(""); 2508 LeaveFunction("");
2505 } 2509 }
2506 2510
2507 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, 2511 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
2508 bool has_context, 2512 bool has_context,
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
3206 scoped_refptr<X509Certificate> 3210 scoped_refptr<X509Certificate>
3207 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3211 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3208 return core_->state().server_cert.get(); 3212 return core_->state().server_cert.get();
3209 } 3213 }
3210 3214
3211 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3215 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3212 return channel_id_service_; 3216 return channel_id_service_;
3213 } 3217 }
3214 3218
3215 } // namespace net 3219 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698