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

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

Issue 10543106: Add an explicit function to init NSS for SSL server sockets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile fix Created 8 years, 6 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
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #include "net/base/net_errors.h" 95 #include "net/base/net_errors.h"
96 #include "net/base/net_log.h" 96 #include "net/base/net_log.h"
97 #include "net/base/single_request_cert_verifier.h" 97 #include "net/base/single_request_cert_verifier.h"
98 #include "net/base/ssl_cert_request_info.h" 98 #include "net/base/ssl_cert_request_info.h"
99 #include "net/base/ssl_connection_status_flags.h" 99 #include "net/base/ssl_connection_status_flags.h"
100 #include "net/base/ssl_info.h" 100 #include "net/base/ssl_info.h"
101 #include "net/base/x509_certificate_net_log_param.h" 101 #include "net/base/x509_certificate_net_log_param.h"
102 #include "net/ocsp/nss_ocsp.h" 102 #include "net/ocsp/nss_ocsp.h"
103 #include "net/socket/client_socket_handle.h" 103 #include "net/socket/client_socket_handle.h"
104 #include "net/socket/nss_ssl_util.h" 104 #include "net/socket/nss_ssl_util.h"
105 #include "net/socket/nss_ssl_util_internal.h"
105 #include "net/socket/ssl_error_params.h" 106 #include "net/socket/ssl_error_params.h"
106 #include "net/socket/ssl_host_info.h" 107 #include "net/socket/ssl_host_info.h"
107 108
108 #if defined(OS_WIN) 109 #if defined(OS_WIN)
109 #include <windows.h> 110 #include <windows.h>
110 #include <wincrypt.h> 111 #include <wincrypt.h>
111 #elif defined(OS_MACOSX) 112 #elif defined(OS_MACOSX)
112 #include <Security/SecBase.h> 113 #include <Security/SecBase.h>
113 #include <Security/SecCertificate.h> 114 #include <Security/SecCertificate.h>
114 #include <Security/SecIdentity.h> 115 #include <Security/SecIdentity.h>
(...skipping 3566 matching lines...) Expand 10 before | Expand all | Expand 10 after
3681 EnsureThreadIdAssigned(); 3682 EnsureThreadIdAssigned();
3682 base::AutoLock auto_lock(lock_); 3683 base::AutoLock auto_lock(lock_);
3683 return valid_thread_id_ == base::PlatformThread::CurrentId(); 3684 return valid_thread_id_ == base::PlatformThread::CurrentId();
3684 } 3685 }
3685 3686
3686 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3687 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3687 return server_bound_cert_service_; 3688 return server_bound_cert_service_;
3688 } 3689 }
3689 3690
3690 } // namespace net 3691 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698