diff options
Diffstat (limited to 'ACE/ace/SSL/SSL_Context.cpp')
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 2d71688c3c2..cca47377cde 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -1,3 +1,4 @@ +// $Id$ #include "SSL_Context.h" #include "sslconf.h" @@ -26,11 +27,6 @@ #include <openssl/rand.h> #include <openssl/safestack.h> -ACE_RCSID (ACE_SSL, - SSL_Context, - "$Id$") - - namespace { /// Reference count of the number of times the ACE_SSL_Context was @@ -206,9 +202,6 @@ ACE_SSL_Context::ssl_library_fini (void) --ssl_library_init_count; if (ssl_library_init_count == 0) { - // Explicitly close the singleton - ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::close(); - ::ERR_free_strings (); ::EVP_cleanup (); @@ -220,7 +213,6 @@ ACE_SSL_Context::ssl_library_fini (void) delete [] this->locks_; this->locks_ = 0; - #endif /* ACE_HAS_THREADS */ } } @@ -236,7 +228,11 @@ ACE_SSL_Context::set_mode (int mode) if (this->context_ != 0) return -1; +#if OPENSSL_VERSION_NUMBER >= 0x10000002 + const SSL_METHOD *method = 0; +#else SSL_METHOD *method = 0; +#endif switch (mode) { @@ -645,8 +641,8 @@ ACE_SSL_Context::dh_params (const char *file_name, #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> * - ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_; +template ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> * + ACE_Unmanaged_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ |