From 313834720d46a68071afe305975f8b70e9bc5782 Mon Sep 17 00:00:00 2001 From: "joth@chromium.org" Date: Wed, 17 Nov 2010 09:57:18 +0000 Subject: Refactor EnsureOpenSSLInit and openssl_util into base This allows the base/crypto methods to call EnsureOpenSSLInit. Also factors out the SSL_CTX and X509_STORE to be more closely associated with their consumers (ssl socket and X509Certificate resp.) rather than process wide globals. BUG=None TEST=None Review URL: http://codereview.chromium.org/4963002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66413 0039d316-1c4b-4281-b951-d872f2087c98 --- base/openssl_util.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'base/openssl_util.h') diff --git a/base/openssl_util.h b/base/openssl_util.h index ed4101f..1d290ae 100644 --- a/base/openssl_util.h +++ b/base/openssl_util.h @@ -11,6 +11,20 @@ namespace base { +// A helper class that takes care of destroying OpenSSL objects when it goes out +// of scope. +template +class ScopedOpenSSL { + public: + explicit ScopedOpenSSL(T* ptr_) : ptr_(ptr_) { } + ~ScopedOpenSSL() { if (ptr_) (*destructor)(ptr_); } + + T* get() const { return ptr_; } + + private: + T* ptr_; +}; + // Provides a buffer of at least MIN_SIZE bytes, for use when calling OpenSSL's // SHA256, HMAC, etc functions, adapting the buffer sizing rules to meet those // of the our base wrapper APIs. @@ -51,6 +65,12 @@ class ScopedOpenSSLSafeSizeBuffer { DISALLOW_COPY_AND_ASSIGN(ScopedOpenSSLSafeSizeBuffer); }; +// Initialize OpenSSL if it isn't already initialized. This must be called +// before any other OpenSSL functions. +// This function is thread-safe, and OpenSSL will only ever be initialized once. +// OpenSSL will be properly shut down on program exit. +void EnsureOpenSSLInit(); + // Drains the OpenSSL ERR_get_error stack. On a debug build the error codes // are send to VLOG(1), on a release build they are disregarded. void ClearOpenSSLERRStack(); -- cgit v1.1