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

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

Issue 384873002: This CL changes the lifespan of SSLConnectJobMessengers so that they are created only when needed, (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@useloop
Patch Set: Removed FormatSessionCacheKey function. Created 6 years, 5 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 2863 matching lines...) Expand 10 before | Expand all | Expand 10 after
2874 << " for cipherSuite " << cipher_suite; 2874 << " for cipherSuite " << cipher_suite;
2875 } 2875 }
2876 2876
2877 ssl_info->handshake_type = core_->state().resumed_handshake ? 2877 ssl_info->handshake_type = core_->state().resumed_handshake ?
2878 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; 2878 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL;
2879 2879
2880 LeaveFunction(""); 2880 LeaveFunction("");
2881 return true; 2881 return true;
2882 } 2882 }
2883 2883
2884 std::string SSLClientSocketNSS::GetSessionCacheKey() const {
2885 NOTREACHED();
2886 return "";
Ryan Sleevi 2014/07/25 21:40:07 std::string() - but it does seem very weird, since
mshelley 2014/07/28 21:05:32 This method was changed from a static method to a
Ryan Sleevi 2014/07/28 23:47:38 Surprisingly hidden, https://code.google.com/p/chr
2887 }
2888
2884 bool SSLClientSocketNSS::InSessionCache() const { 2889 bool SSLClientSocketNSS::InSessionCache() const {
2885 // For now, always return true so that SSLConnectJobs are never held back. 2890 // For now, always return true so that SSLConnectJobs are never held back.
2886 return true; 2891 return true;
2887 } 2892 }
2888 2893
2889 void SSLClientSocketNSS::WatchSessionForCompletion( 2894 void SSLClientSocketNSS::WatchSessionForCompletion(
2890 const base::Closure& callback) { 2895 const base::Closure& callback) {
2891 NOTREACHED(); 2896 NOTREACHED();
2892 } 2897 }
2893 2898
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
3637 scoped_refptr<X509Certificate> 3642 scoped_refptr<X509Certificate>
3638 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3643 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3639 return core_->state().server_cert.get(); 3644 return core_->state().server_cert.get();
3640 } 3645 }
3641 3646
3642 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3647 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3643 return server_bound_cert_service_; 3648 return server_bound_cert_service_;
3644 } 3649 }
3645 3650
3646 } // namespace net 3651 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698