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

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

Issue 1135373002: Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/socket_net_log_params.cc ('k') | net/socket/ssl_client_socket_openssl.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 1984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1995 return OK; 1995 return OK;
1996 } 1996 }
1997 1997
1998 void SSLClientSocketNSS::Core::UpdateServerCert() { 1998 void SSLClientSocketNSS::Core::UpdateServerCert() {
1999 nss_handshake_state_.server_cert_chain.Reset(nss_fd_); 1999 nss_handshake_state_.server_cert_chain.Reset(nss_fd_);
2000 nss_handshake_state_.server_cert = X509Certificate::CreateFromDERCertChain( 2000 nss_handshake_state_.server_cert = X509Certificate::CreateFromDERCertChain(
2001 nss_handshake_state_.server_cert_chain.AsStringPieceVector()); 2001 nss_handshake_state_.server_cert_chain.AsStringPieceVector());
2002 if (nss_handshake_state_.server_cert.get()) { 2002 if (nss_handshake_state_.server_cert.get()) {
2003 // Since this will be called asynchronously on another thread, it needs to 2003 // Since this will be called asynchronously on another thread, it needs to
2004 // own a reference to the certificate. 2004 // own a reference to the certificate.
2005 NetLog::ParametersCallback net_log_callback = 2005 NetLog::ParametersCallback net_log_callback = base::Bind(
2006 base::Bind(&NetLogX509CertificateCallback, 2006 NetLogX509CertificateCallback, nss_handshake_state_.server_cert);
2007 nss_handshake_state_.server_cert);
2008 PostOrRunCallback( 2007 PostOrRunCallback(
2009 FROM_HERE, 2008 FROM_HERE,
2010 base::Bind(&AddLogEventWithCallback, weak_net_log_, 2009 base::Bind(&AddLogEventWithCallback, weak_net_log_,
2011 NetLog::TYPE_SSL_CERTIFICATES_RECEIVED, 2010 NetLog::TYPE_SSL_CERTIFICATES_RECEIVED,
2012 net_log_callback)); 2011 net_log_callback));
2013 } 2012 }
2014 } 2013 }
2015 2014
2016 void SSLClientSocketNSS::Core::UpdateSignedCertTimestamps() { 2015 void SSLClientSocketNSS::Core::UpdateSignedCertTimestamps() {
2017 const SECItem* signed_cert_timestamps = 2016 const SECItem* signed_cert_timestamps =
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
3206 scoped_refptr<X509Certificate> 3205 scoped_refptr<X509Certificate>
3207 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3206 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3208 return core_->state().server_cert.get(); 3207 return core_->state().server_cert.get();
3209 } 3208 }
3210 3209
3211 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3210 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3212 return channel_id_service_; 3211 return channel_id_service_;
3213 } 3212 }
3214 3213
3215 } // namespace net 3214 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socket_net_log_params.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698