AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respect the OPENSSL_NO_ENGINE feature test #define.

Browse Source
This commit is contained in:
Christopher Kohlhoff 2012-05-24 07:38:10 +10:00
parent 199ba153a4
commit 1f65c999c6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asio/include/asio/ssl/detail/impl/openssl_init.ipp
View File

@ -55,7 +55,9 @@ public:
::EVP_cleanup(); ::EVP_cleanup();
::CRYPTO_cleanup_all_ex_data(); ::CRYPTO_cleanup_all_ex_data();
::CONF_modules_unload(1); ::CONF_modules_unload(1);
#if !defined(OPENSSL_NO_ENGINE)
::ENGINE_cleanup(); ::ENGINE_cleanup();
#endif // !defined(OPENSSL_NO_ENGINE)
} }
private: private:

4
asio/include/asio/ssl/detail/openssl_types.hpp
View File

@ -18,7 +18,9 @@
#include "asio/detail/config.hpp" #include "asio/detail/config.hpp"
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/ssl.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/err.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include "asio/detail/socket_types.hpp" #include "asio/detail/socket_types.hpp"