diff options
author | Tobias Brunner <tobias@strongswan.org> | 2013-04-17 11:43:06 +0200 |
---|---|---|
committer | Tobias Brunner <tobias@strongswan.org> | 2013-05-08 15:02:40 +0200 |
commit | 780900ab0e747a4dbdf70bfa2a40f1cd19581744 (patch) | |
tree | f4fac5f8aae166d35988d05d0f881cef606ac6ac /src/libstrongswan/plugins/openssl/openssl_plugin.c | |
parent | 651d5ab8e72f2dd2ce40544b59d974007afdc880 (diff) | |
download | strongswan-780900ab0e747a4dbdf70bfa2a40f1cd19581744.tar.bz2 strongswan-780900ab0e747a4dbdf70bfa2a40f1cd19581744.tar.xz |
openssl: Add PKCS#12 parsing via OpenSSL
Diffstat (limited to 'src/libstrongswan/plugins/openssl/openssl_plugin.c')
-rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_plugin.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c index 2371008fd..174f94e05 100644 --- a/src/libstrongswan/plugins/openssl/openssl_plugin.c +++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c @@ -42,6 +42,7 @@ #include "openssl_x509.h" #include "openssl_crl.h" #include "openssl_pkcs7.h" +#include "openssl_pkcs12.h" #include "openssl_rng.h" #include "openssl_hmac.h" #include "openssl_gcm.h" @@ -394,6 +395,8 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS7), #endif /* OPENSSL_NO_CMS */ #endif /* OPENSSL_VERSION_NUMBER */ + PLUGIN_REGISTER(CONTAINER_DECODE, openssl_pkcs12_load, TRUE), + PLUGIN_PROVIDE(CONTAINER_DECODE, CONTAINER_PKCS12), #ifndef OPENSSL_NO_ECDH /* EC DH groups */ PLUGIN_REGISTER(DH, openssl_ec_diffie_hellman_create), |