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

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

Issue 395303003: Fix a few stray net::'s in net/socket/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/server_socket.h ('k') | net/socket/ssl_client_socket_openssl_unittest.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 1783 matching lines...) Expand 10 before | Expand all | Expand 10 after
1794 network_moved = DoTransportIO(); 1794 network_moved = DoTransportIO();
1795 } while (rv == ERR_IO_PENDING && network_moved); 1795 } while (rv == ERR_IO_PENDING && network_moved);
1796 1796
1797 LeaveFunction(rv); 1797 LeaveFunction(rv);
1798 return rv; 1798 return rv;
1799 } 1799 }
1800 1800
1801 int SSLClientSocketNSS::Core::DoHandshake() { 1801 int SSLClientSocketNSS::Core::DoHandshake() {
1802 DCHECK(OnNSSTaskRunner()); 1802 DCHECK(OnNSSTaskRunner());
1803 1803
1804 int net_error = net::OK; 1804 int net_error = OK;
1805 SECStatus rv = SSL_ForceHandshake(nss_fd_); 1805 SECStatus rv = SSL_ForceHandshake(nss_fd_);
1806 1806
1807 // Note: this function may be called multiple times during the handshake, so 1807 // Note: this function may be called multiple times during the handshake, so
1808 // even though channel id and client auth are separate else cases, they can 1808 // even though channel id and client auth are separate else cases, they can
1809 // both be used during a single SSL handshake. 1809 // both be used during a single SSL handshake.
1810 if (channel_id_needed_) { 1810 if (channel_id_needed_) {
1811 GotoState(STATE_GET_DOMAIN_BOUND_CERT_COMPLETE); 1811 GotoState(STATE_GET_DOMAIN_BOUND_CERT_COMPLETE);
1812 net_error = ERR_IO_PENDING; 1812 net_error = ERR_IO_PENDING;
1813 } else if (client_auth_cert_needed_) { 1813 } else if (client_auth_cert_needed_) {
1814 net_error = ERR_SSL_CLIENT_AUTH_CERT_NEEDED; 1814 net_error = ERR_SSL_CLIENT_AUTH_CERT_NEEDED;
(...skipping 1774 matching lines...) Expand 10 before | Expand all | Expand 10 after
3589 scoped_refptr<X509Certificate> 3589 scoped_refptr<X509Certificate>
3590 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3590 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3591 return core_->state().server_cert.get(); 3591 return core_->state().server_cert.get();
3592 } 3592 }
3593 3593
3594 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3594 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3595 return server_bound_cert_service_; 3595 return server_bound_cert_service_;
3596 } 3596 }
3597 3597
3598 } // namespace net 3598 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/server_socket.h ('k') | net/socket/ssl_client_socket_openssl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698