diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-06-22 11:33:21 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-06-22 11:55:34 +0200 |
| commit | 1e3d66f8d3843b330ba0b31f700597113c54b3e0 (patch) | |
| tree | ea1dcbe6e5b23dd72438ddcfe1d8e8deec9f91a4 /src/libstrongswan/plugins/openssl/openssl_plugin.c | |
| parent | 5a367e99c3113f59315d750009b38fcde5fde986 (diff) | |
| download | strongswan-1e3d66f8d3843b330ba0b31f700597113c54b3e0.tar.bz2 strongswan-1e3d66f8d3843b330ba0b31f700597113c54b3e0.tar.xz | |
Fixing compilation of the OpenSSL plugin if ENGINE support is disabled.
That is, enable compilation if OpenSSL was configured with
OPENSSL_NO_ENGINE.
Diffstat (limited to 'src/libstrongswan/plugins/openssl/openssl_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_plugin.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index 2a97dbcc3..31697dcb8 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -14,10 +14,12 @@ * for more details. */ -#include <openssl/conf.h> #include <openssl/evp.h> -#include <openssl/engine.h> +#include <openssl/conf.h> #include <openssl/crypto.h> +#ifndef OPENSSL_NO_ENGINE +#include <openssl/engine.h> +#endif #include "openssl_plugin.h" @@ -200,7 +202,9 @@ static void destroy(private_openssl_plugin_t *this) lib->creds->remove_builder(lib->creds, (builder_function_t)openssl_crl_load); +#ifndef OPENSSL_NO_ENGINE ENGINE_cleanup(); +#endif /* OPENSSL_NO_ENGINE */ EVP_cleanup(); CONF_modules_free(); @@ -223,9 +227,11 @@ plugin_t *openssl_plugin_create() OPENSSL_config(NULL); OpenSSL_add_all_algorithms(); +#ifndef OPENSSL_NO_ENGINE /* activate support for hardware accelerators */ ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); +#endif /* OPENSSL_NO_ENGINE */ /* crypter */ lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, |