fixed feature dependencies for CERT_TRUSTED_PUBKEY

diff --git a/src/libcharon/plugins/stroke/stroke_plugin.c b/src/libcharon/plugins/stroke/stroke_plugin.c
index 53b97e7..4e47a12 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_plugin.c
+++ b/src/libcharon/plugins/stroke/stroke_plugin.c
@@ -71,6 +71,8 @@ METHOD(plugin_t, get_features, int,
                                PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
                                PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
                                PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_CRL),
                                PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
                                PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
                                PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_CRL),

+                               PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_AC),
+                               PLUGIN_SDEPEND(CERT_DECODE, CERT_TRUSTED_PUBKEY),

        };
        *features = f;
        return countof(f);
        };
        *features = f;
        return countof(f);

diff --git a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
index 92bfc2e..a898bbf 100644 (file)
--- a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
+++ b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
@@ -43,6 +43,11 @@ METHOD(plugin_t, get_features, int,
        static plugin_feature_t f[] = {
                PLUGIN_REGISTER(CERT_ENCODE, pubkey_cert_wrap, FALSE),
                        PLUGIN_PROVIDE(CERT_ENCODE, CERT_TRUSTED_PUBKEY),
        static plugin_feature_t f[] = {
                PLUGIN_REGISTER(CERT_ENCODE, pubkey_cert_wrap, FALSE),
                        PLUGIN_PROVIDE(CERT_ENCODE, CERT_TRUSTED_PUBKEY),

+               PLUGIN_REGISTER(CERT_DECODE, pubkey_cert_wrap, TRUE),
+                       PLUGIN_PROVIDE(CERT_DECODE, CERT_TRUSTED_PUBKEY),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_RSA),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_ECDSA),
+                               PLUGIN_SDEPEND(PUBKEY, KEY_DSA),

        };
        *features = f;
        return countof(f);
        };
        *features = f;
        return countof(f);