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

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

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed additional arg from GetNextProto (was added in by rebase (?)) and fixed other small bugs. Created 6 years, 4 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 2816 matching lines...) Expand 10 before | Expand all | Expand 10 after
2827 << " for cipherSuite " << cipher_suite; 2827 << " for cipherSuite " << cipher_suite;
2828 } 2828 }
2829 2829
2830 ssl_info->handshake_type = core_->state().resumed_handshake ? 2830 ssl_info->handshake_type = core_->state().resumed_handshake ?
2831 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; 2831 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL;
2832 2832
2833 LeaveFunction(""); 2833 LeaveFunction("");
2834 return true; 2834 return true;
2835 } 2835 }
2836 2836
2837 bool SSLClientSocketNSS::InSessionCache() const {
2838 // For now, always return true so that SSLConnectJobs are never held back.
2839 return true;
2840 }
2841
2842 void SSLClientSocketNSS::SetHandshakeCompletionCallback(
2843 const base::Closure& callback) {
2844 NOTIMPLEMENTED();
2845 }
2837 void SSLClientSocketNSS::GetSSLCertRequestInfo( 2846 void SSLClientSocketNSS::GetSSLCertRequestInfo(
2838 SSLCertRequestInfo* cert_request_info) { 2847 SSLCertRequestInfo* cert_request_info) {
2839 EnterFunction(""); 2848 EnterFunction("");
2840 cert_request_info->host_and_port = host_and_port_; 2849 cert_request_info->host_and_port = host_and_port_;
2841 cert_request_info->cert_authorities = core_->state().cert_authorities; 2850 cert_request_info->cert_authorities = core_->state().cert_authorities;
2842 LeaveFunction(""); 2851 LeaveFunction("");
2843 } 2852 }
2844 2853
2845 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, 2854 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
2846 bool has_context, 2855 bool has_context,
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
3565 scoped_refptr<X509Certificate> 3574 scoped_refptr<X509Certificate>
3566 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3575 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3567 return core_->state().server_cert.get(); 3576 return core_->state().server_cert.get();
3568 } 3577 }
3569 3578
3570 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3579 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3571 return channel_id_service_; 3580 return channel_id_service_;
3572 } 3581 }
3573 3582
3574 } // namespace net 3583 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698