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

Side by Side Diff: crypto/openssl_util.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "base/openssl_util.h" 5 #include "crypto/openssl_util.h"
6 6
7 #include <openssl/err.h> 7 #include <openssl/err.h>
8 #include <openssl/ssl.h> 8 #include <openssl/ssl.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
13 #include "base/string_piece.h" 13 #include "base/string_piece.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 15
16 namespace base { 16 namespace crypto {
17 17
18 namespace { 18 namespace {
19 19
20 unsigned long CurrentThreadId() { 20 unsigned long CurrentThreadId() {
21 return static_cast<unsigned long>(PlatformThread::CurrentId()); 21 return static_cast<unsigned long>(base::PlatformThread::CurrentId());
22 } 22 }
23 23
24 // Singleton for initializing and cleaning up the OpenSSL library. 24 // Singleton for initializing and cleaning up the OpenSSL library.
25 class OpenSSLInitSingleton { 25 class OpenSSLInitSingleton {
26 public: 26 public:
27 static OpenSSLInitSingleton* GetInstance() { 27 static OpenSSLInitSingleton* GetInstance() {
28 // We allow the SSL environment to leak for multiple reasons: 28 // We allow the SSL environment to leak for multiple reasons:
29 // - it is used from a non-joinable worker thread that is not stopped on 29 // - it is used from a non-joinable worker thread that is not stopped on
30 // shutdown, hence may still be using OpenSSL library after the AtExit 30 // shutdown, hence may still be using OpenSSL library after the AtExit
31 // runner has completed. 31 // runner has completed.
32 // - There are other OpenSSL related singletons (e.g. the client socket 32 // - There are other OpenSSL related singletons (e.g. the client socket
33 // context) who's cleanup depends on the global environment here, but 33 // context) who's cleanup depends on the global environment here, but
34 // we can't control the order the AtExit handlers will run in so 34 // we can't control the order the AtExit handlers will run in so
35 // allowing the global environment to leak at least ensures it is 35 // allowing the global environment to leak at least ensures it is
36 // available for those other singletons to reliably cleanup. 36 // available for those other singletons to reliably cleanup.
37 return Singleton<OpenSSLInitSingleton, 37 return base::Singleton<OpenSSLInitSingleton,
38 LeakySingletonTraits<OpenSSLInitSingleton> >::get(); 38 base::LeakySingletonTraits<OpenSSLInitSingleton> >::get();
39 } 39 }
40 private: 40 private:
41 friend struct DefaultSingletonTraits<OpenSSLInitSingleton>; 41 friend struct DefaultSingletonTraits<OpenSSLInitSingleton>;
42 OpenSSLInitSingleton() { 42 OpenSSLInitSingleton() {
43 SSL_load_error_strings(); 43 SSL_load_error_strings();
44 SSL_library_init(); 44 SSL_library_init();
45 OpenSSL_add_all_algorithms(); 45 OpenSSL_add_all_algorithms();
46 int num_locks = CRYPTO_num_locks(); 46 int num_locks = CRYPTO_num_locks();
47 locks_.reserve(num_locks); 47 locks_.reserve(num_locks);
48 for (int i = 0; i < num_locks; ++i) 48 for (int i = 0; i < num_locks; ++i)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 std::string message; 104 std::string message;
105 location.Write(true, true, &message); 105 location.Write(true, true, &message);
106 DVLOG(1) << "OpenSSL ERR_get_error stack from " << message; 106 DVLOG(1) << "OpenSSL ERR_get_error stack from " << message;
107 ERR_print_errors_cb(&OpenSSLErrorCallback, NULL); 107 ERR_print_errors_cb(&OpenSSLErrorCallback, NULL);
108 } else { 108 } else {
109 ERR_clear_error(); 109 ERR_clear_error();
110 } 110 }
111 } 111 }
112 112
113 } // namespace base 113 } // namespace crypto
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698