denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Disable PKCS#7/CMS when building against OpenSSL < 0.9.8g

Browse Source 
Fixes #292.
This commit is contained in:
Tobias Brunner
2013-02-20 18:34:54 +01:00
parent 7a93844f21
commit 0d237763dc
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_pkcs7.c
+3
View File
@@ -13,8 +13,10 @@
* for more details. * for more details.
*/ */
#include <openssl/opensslv.h>
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#if OPENSSL_VERSION_NUMBER >= 0x0090807fL
#ifndef OPENSSL_NO_CMS #ifndef OPENSSL_NO_CMS
#include "openssl_pkcs7.h" #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_NO_CMS */
#endif /* OPENSSL_VERSION_NUMBER */
src/libstrongswan/plugins/openssl/openssl_plugin.c
+2 -1
View File
@@ -366,10 +366,12 @@ METHOD(plugin_t, get_features, int,
PLUGIN_SDEPEND(PUBKEY, KEY_DSA), PLUGIN_SDEPEND(PUBKEY, KEY_DSA),
PLUGIN_REGISTER(CERT_DECODE, openssl_crl_load, TRUE), PLUGIN_REGISTER(CERT_DECODE, openssl_crl_load, TRUE),
PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_CRL), PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_CRL),
#if OPENSSL_VERSION_NUMBER >= 0x0090807fL
#ifndef OPENSSL_NO_CMS #ifndef OPENSSL_NO_CMS
PLUGIN_REGISTER(CONTAINER_DECODE, openssl_pkcs7_load, TRUE), PLUGIN_REGISTER(CONTAINER_DECODE, openssl_pkcs7_load, TRUE),
PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS7), PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS7),
#endif /* OPENSSL_NO_CMS */ #endif /* OPENSSL_NO_CMS */
#endif /* OPENSSL_VERSION_NUMBER */
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
/* EC DH groups */ /* EC DH groups */
PLUGIN_REGISTER(DH, openssl_ec_diffie_hellman_create), PLUGIN_REGISTER(DH, openssl_ec_diffie_hellman_create),
@@ -470,4 +472,3 @@ plugin_t *openssl_plugin_create()
return &this->public.plugin; return &this->public.plugin;
} }