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

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

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/socks_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('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 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after
2281 // the network task runner. 2281 // the network task runner.
2282 PostOrRunCallback( 2282 PostOrRunCallback(
2283 FROM_HERE, 2283 FROM_HERE,
2284 base::Bind(&Core::OnNSSBufferUpdated, this, amount_in_read_buffer)); 2284 base::Bind(&Core::OnNSSBufferUpdated, this, amount_in_read_buffer));
2285 PostOrRunCallback( 2285 PostOrRunCallback(
2286 FROM_HERE, 2286 FROM_HERE,
2287 base::Bind(&Core::DidNSSRead, this, rv)); 2287 base::Bind(&Core::DidNSSRead, this, rv));
2288 // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed. 2288 // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed.
2289 tracked_objects::ScopedTracker tracking_profile1( 2289 tracked_objects::ScopedTracker tracking_profile1(
2290 FROM_HERE_WITH_EXPLICIT_FUNCTION( 2290 FROM_HERE_WITH_EXPLICIT_FUNCTION(
2291 "SSLClientSocketNSS::Core::DoReadCallback")); 2291 "418183 SSLClientSocketNSS::Core::DoReadCallback"));
2292 PostOrRunCallback( 2292 PostOrRunCallback(
2293 FROM_HERE, 2293 FROM_HERE,
2294 base::Bind(base::ResetAndReturn(&user_read_callback_), rv)); 2294 base::Bind(base::ResetAndReturn(&user_read_callback_), rv));
2295 } 2295 }
2296 2296
2297 void SSLClientSocketNSS::Core::DoWriteCallback(int rv) { 2297 void SSLClientSocketNSS::Core::DoWriteCallback(int rv) {
2298 DCHECK(OnNSSTaskRunner()); 2298 DCHECK(OnNSSTaskRunner());
2299 DCHECK_NE(ERR_IO_PENDING, rv); 2299 DCHECK_NE(ERR_IO_PENDING, rv);
2300 DCHECK(!user_write_callback_.is_null()); 2300 DCHECK(!user_write_callback_.is_null());
2301 2301
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
3635 scoped_refptr<X509Certificate> 3635 scoped_refptr<X509Certificate>
3636 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3636 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3637 return core_->state().server_cert.get(); 3637 return core_->state().server_cert.get();
3638 } 3638 }
3639 3639
3640 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3640 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3641 return channel_id_service_; 3641 return channel_id_service_;
3642 } 3642 }
3643 3643
3644 } // namespace net 3644 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socks_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698