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

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: Changed Connect to use a state loop, and moved location of OnHandshakeFailure calls. 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 bool SSLClientSocketNSS::InSessionCache() const {
2885 // For now, always return true so that SSLConnectJobs are never held back.
2886 return true;
2887 }
2888
2889 void SSLClientSocketNSS::SetHandshakeSuccessCallback(
2890 const base::Closure& callback) {
2891 NOTIMPLEMENTED();
2892 }
2893
2894 void SSLClientSocketNSS::SetHandshakeFailureCallback(
2895 const base::Closure& callback) {
2896 NOTIMPLEMENTED();
2897 }
2898
2884 void SSLClientSocketNSS::GetSSLCertRequestInfo( 2899 void SSLClientSocketNSS::GetSSLCertRequestInfo(
2885 SSLCertRequestInfo* cert_request_info) { 2900 SSLCertRequestInfo* cert_request_info) {
2886 EnterFunction(""); 2901 EnterFunction("");
2887 cert_request_info->host_and_port = host_and_port_; 2902 cert_request_info->host_and_port = host_and_port_;
2888 cert_request_info->cert_authorities = core_->state().cert_authorities; 2903 cert_request_info->cert_authorities = core_->state().cert_authorities;
2889 LeaveFunction(""); 2904 LeaveFunction("");
2890 } 2905 }
2891 2906
2892 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, 2907 int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
2893 bool has_context, 2908 bool has_context,
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
3614 scoped_refptr<X509Certificate> 3629 scoped_refptr<X509Certificate>
3615 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3630 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3616 return core_->state().server_cert.get(); 3631 return core_->state().server_cert.get();
3617 } 3632 }
3618 3633
3619 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3634 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3620 return server_bound_cert_service_; 3635 return server_bound_cert_service_;
3621 } 3636 }
3622 3637
3623 } // namespace net 3638 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698