Certificate decoding soft-depends on public key decoding of specific types

diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c
index c93ceacc933d32aa546cee205eec178ab6230175..9177dabc70d290194e71a7dcace9f4e4c58806a5 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_plugin.c
+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -317,6 +317,9 @@ METHOD(plugin_t, get_features, int,
                /* certificate/CRL loading */
                PLUGIN_REGISTER(CERT_DECODE, openssl_x509_load, TRUE),
                        PLUGIN_PROVIDE(CERT_DECODE, CERT_X509),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_RSA),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_ECDSA),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_DSA),
                PLUGIN_REGISTER(CERT_DECODE, openssl_crl_load, TRUE),
                        PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_CRL),
 #ifndef OPENSSL_NO_ECDH

diff --git a/src/libstrongswan/plugins/x509/x509_plugin.c b/src/libstrongswan/plugins/x509/x509_plugin.c
index ed6fbfd91d72119b8b432ce84e088701c9a8af25..15fea7ee0c3511fed30282d0c86c4110fa43805c 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_plugin.c
+++ b/src/libstrongswan/plugins/x509/x509_plugin.c
@@ -52,6 +52,9 @@ METHOD(plugin_t, get_features, int,
                PLUGIN_REGISTER(CERT_DECODE, x509_cert_load, TRUE),
                        PLUGIN_PROVIDE(CERT_DECODE, CERT_X509),
                                PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_RSA),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_ECDSA),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_DSA),
 
                PLUGIN_REGISTER(CERT_ENCODE, x509_ac_gen, FALSE),
                        PLUGIN_PROVIDE(CERT_ENCODE, CERT_X509_AC),