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

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: Return fake ConnectionAttempt in MockTCPClientSocket 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
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2473 matching lines...) Expand 10 before | Expand all | Expand 10 after
2484 << " for cipherSuite " << cipher_suite; 2484 << " for cipherSuite " << cipher_suite;
2485 } 2485 }
2486 2486
2487 ssl_info->handshake_type = core_->state().resumed_handshake ? 2487 ssl_info->handshake_type = core_->state().resumed_handshake ?
2488 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; 2488 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL;
2489 2489
2490 LeaveFunction(""); 2490 LeaveFunction("");
2491 return true; 2491 return true;
2492 } 2492 }
2493 2493
2494 void SSLClientSocketNSS::GetConnectionAttempts(ConnectionAttempts* out) const {
2495 out->clear();
2496 }
2497
2494 void SSLClientSocketNSS::GetSSLCertRequestInfo( 2498 void SSLClientSocketNSS::GetSSLCertRequestInfo(
2495 SSLCertRequestInfo* cert_request_info) { 2499 SSLCertRequestInfo* cert_request_info) {
2496 EnterFunction(""); 2500 EnterFunction("");
2497 cert_request_info->host_and_port = host_and_port_; 2501 cert_request_info->host_and_port = host_and_port_;
2498 cert_request_info->cert_authorities = core_->state().cert_authorities; 2502 cert_request_info->cert_authorities = core_->state().cert_authorities;
2499 LeaveFunction(""); 2503 LeaveFunction("");
2500 } 2504 }
2501 2505
2502 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, 2506 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
2503 bool has_context, 2507 bool has_context,
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
3198 scoped_refptr<X509Certificate> 3202 scoped_refptr<X509Certificate>
3199 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3203 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3200 return core_->state().server_cert.get(); 3204 return core_->state().server_cert.get();
3201 } 3205 }
3202 3206
3203 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3207 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3204 return channel_id_service_; 3208 return channel_id_service_;
3205 } 3209 }
3206 3210
3207 } // namespace net 3211 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698