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

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

Issue 981723008: Unwind the SSL connection holdback experiment and remove related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename & reformat Created 5 years, 9 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 2907 matching lines...) Expand 10 before | Expand all | Expand 10 after
2918 << " for cipherSuite " << cipher_suite; 2918 << " for cipherSuite " << cipher_suite;
2919 } 2919 }
2920 2920
2921 ssl_info->handshake_type = core_->state().resumed_handshake ? 2921 ssl_info->handshake_type = core_->state().resumed_handshake ?
2922 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; 2922 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL;
2923 2923
2924 LeaveFunction(""); 2924 LeaveFunction("");
2925 return true; 2925 return true;
2926 } 2926 }
2927 2927
2928 std::string SSLClientSocketNSS::GetSessionCacheKey() const {
2929 NOTIMPLEMENTED();
2930 return std::string();
2931 }
2932
2933 bool SSLClientSocketNSS::InSessionCache() const {
2934 // For now, always return true so that SSLConnectJobs are never held back.
2935 return true;
2936 }
2937
2938 void SSLClientSocketNSS::SetHandshakeCompletionCallback(
2939 const base::Closure& callback) {
2940 NOTIMPLEMENTED();
2941 }
2942
2943 void SSLClientSocketNSS::GetSSLCertRequestInfo( 2928 void SSLClientSocketNSS::GetSSLCertRequestInfo(
2944 SSLCertRequestInfo* cert_request_info) { 2929 SSLCertRequestInfo* cert_request_info) {
2945 EnterFunction(""); 2930 EnterFunction("");
2946 cert_request_info->host_and_port = host_and_port_; 2931 cert_request_info->host_and_port = host_and_port_;
2947 cert_request_info->cert_authorities = core_->state().cert_authorities; 2932 cert_request_info->cert_authorities = core_->state().cert_authorities;
2948 LeaveFunction(""); 2933 LeaveFunction("");
2949 } 2934 }
2950 2935
2951 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, 2936 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
2952 bool has_context, 2937 bool has_context,
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
3639 scoped_refptr<X509Certificate> 3624 scoped_refptr<X509Certificate>
3640 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3625 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3641 return core_->state().server_cert.get(); 3626 return core_->state().server_cert.get();
3642 } 3627 }
3643 3628
3644 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3629 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3645 return channel_id_service_; 3630 return channel_id_service_;
3646 } 3631 }
3647 3632
3648 } // namespace net 3633 } // 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