[Boost-commit] svn:boost r78663 - in trunk/boost/asio/ssl/detail: . impl

Subject: [Boost-commit] svn:boost r78663 - in trunk/boost/asio/ssl/detail: . impl
From: chris_at_[hidden]
Date: 2012-05-26 18:20:48

Author: chris_kohlhoff
Date: 2012-05-26 18:20:47 EDT (Sat, 26 May 2012)
New Revision: 78663
URL: http://svn.boost.org/trac/boost/changeset/78663

Log:
Respect the OPENSSL_NO_ENGINE feature test #define.
Text files modified: 
   trunk/boost/asio/ssl/detail/impl/openssl_init.ipp |     2 ++                                      
   trunk/boost/asio/ssl/detail/openssl_types.hpp     |     4 +++-                                    
   2 files changed, 5 insertions(+), 1 deletions(-)

Modified: trunk/boost/asio/ssl/detail/impl/openssl_init.ipp
==============================================================================
--- trunk/boost/asio/ssl/detail/impl/openssl_init.ipp	(original)
+++ trunk/boost/asio/ssl/detail/impl/openssl_init.ipp	2012-05-26 18:20:47 EDT (Sat, 26 May 2012)
@@ -56,7 +56,9 @@
     ::EVP_cleanup();
     ::CRYPTO_cleanup_all_ex_data();
     ::CONF_modules_unload(1);
+#if !defined(OPENSSL_NO_ENGINE)
     ::ENGINE_cleanup();
+#endif // !defined(OPENSSL_NO_ENGINE)
   }
 
 private:

Modified: trunk/boost/asio/ssl/detail/openssl_types.hpp
==============================================================================
--- trunk/boost/asio/ssl/detail/openssl_types.hpp	(original)
+++ trunk/boost/asio/ssl/detail/openssl_types.hpp	2012-05-26 18:20:47 EDT (Sat, 26 May 2012)
@@ -18,7 +18,9 @@
 #include <boost/asio/detail/config.hpp>
 #include <openssl/conf.h>
 #include <openssl/ssl.h>
-#include <openssl/engine.h>
+#if !defined(OPENSSL_NO_ENGINE)
+# include <openssl/engine.h>
+#endif // !defined(OPENSSL_NO_ENGINE)
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 #include <boost/asio/detail/socket_types.hpp>