diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2013-02-19 14:12:57 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-02-20 18:34:54 +0100 |
| commit | 0d237763dc7c2e8be0e88d8cb945a3c39b1f10f6 (patch) | |
| tree | 05e172000fe6209f77ce1e2c00a87a7d81baf485 /src/libstrongswan/plugins/openssl | |
| parent | 7a93844f210023fabdd86601d3ffbb795cd8f5b4 (diff) | |
| download | strongswan-0d237763dc7c2e8be0e88d8cb945a3c39b1f10f6.tar.bz2 strongswan-0d237763dc7c2e8be0e88d8cb945a3c39b1f10f6.tar.xz | |
openssl: Disable PKCS#7/CMS when building against OpenSSL < 0.9.8g
Fixes #292.
Diffstat (limited to 'src/libstrongswan/plugins/openssl')
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_pkcs7.c | 3 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_plugin.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_pkcs7.c b/src/libstrongswan/plugins/openssl/openssl_pkcs7.c index ccc426235..9c3c4040c 100644 --- a/src/libstrongswan/plugins/openssl/openssl_pkcs7.c +++ b/src/libstrongswan/plugins/openssl/openssl_pkcs7.c @@ -13,8 +13,10 @@ * for more details. */ +#include <openssl/opensslv.h> #include <openssl/opensslconf.h> +#if OPENSSL_VERSION_NUMBER >= 0x0090807fL #ifndef OPENSSL_NO_CMS #include "openssl_pkcs7.h" @@ -788,3 +790,4 @@ pkcs7_t *openssl_pkcs7_load(container_type_t type, va_list args) } #endif /* OPENSSL_NO_CMS */ +#endif /* OPENSSL_VERSION_NUMBER */ diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index dd6a379d2..0f5b07137 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -366,10 +366,12 @@ METHOD(plugin_t, get_features, int, PLUGIN_SDEPEND(PUBKEY, KEY_DSA), PLUGIN_REGISTER(CERT_DECODE, openssl_crl_load, TRUE), PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_CRL), +#if OPENSSL_VERSION_NUMBER >= 0x0090807fL #ifndef OPENSSL_NO_CMS PLUGIN_REGISTER(CONTAINER_DECODE, openssl_pkcs7_load, TRUE), PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS7), #endif /* OPENSSL_NO_CMS */ +#endif /* OPENSSL_VERSION_NUMBER */ #ifndef OPENSSL_NO_ECDH /* EC DH groups */ PLUGIN_REGISTER(DH, openssl_ec_diffie_hellman_create), @@ -470,4 +472,3 @@ plugin_t *openssl_plugin_create() return &this->public.plugin; } - |