From: Martin Willi <martin@revosec.ch>
Date: Wed, 29 Feb 2012 15:08:07 +0000 (+0100)
Subject: PEM loading plugin features depend on the same feature, they are helpers only
X-Git-Tag: 5.0.0~336
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b5e637472b762954a3247190c02258cdf9487d1;p=thirdparty%2Fstrongswan.git

PEM loading plugin features depend on the same feature, they are helpers only
---

diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c
index fca717a106..d102e15359 100644
--- a/src/libstrongswan/plugins/pem/pem_plugin.c
+++ b/src/libstrongswan/plugins/pem/pem_plugin.c
@@ -46,46 +46,63 @@ METHOD(plugin_t, get_features, int,
 		/* private key PEM decoding */
 		PLUGIN_REGISTER(PRIVKEY, pem_private_key_load, FALSE),
 			PLUGIN_PROVIDE(PRIVKEY, KEY_ANY),
+				PLUGIN_DEPENDS(PRIVKEY, KEY_ANY),
 				PLUGIN_DEPENDS(HASHER, HASH_MD5),
 		PLUGIN_REGISTER(PRIVKEY, pem_private_key_load, FALSE),
 			PLUGIN_PROVIDE(PRIVKEY, KEY_RSA),
+				PLUGIN_DEPENDS(PRIVKEY, KEY_RSA),
 				PLUGIN_DEPENDS(HASHER, HASH_MD5),
 		PLUGIN_REGISTER(PRIVKEY, pem_private_key_load, FALSE),
 			PLUGIN_PROVIDE(PRIVKEY, KEY_ECDSA),
+				PLUGIN_DEPENDS(PRIVKEY, KEY_ECDSA),
 				PLUGIN_DEPENDS(HASHER, HASH_MD5),
 		PLUGIN_REGISTER(PRIVKEY, pem_private_key_load, FALSE),
 			PLUGIN_PROVIDE(PRIVKEY, KEY_DSA),
+				PLUGIN_DEPENDS(PRIVKEY, KEY_DSA),
 				PLUGIN_DEPENDS(HASHER, HASH_MD5),
 
 		/* public key PEM decoding */
 		PLUGIN_REGISTER(PUBKEY, pem_public_key_load, FALSE),
 			PLUGIN_PROVIDE(PUBKEY, KEY_ANY),
+				PLUGIN_DEPENDS(PUBKEY, KEY_ANY),
 		PLUGIN_REGISTER(PUBKEY, pem_public_key_load, FALSE),
 			PLUGIN_PROVIDE(PUBKEY, KEY_RSA),
+				PLUGIN_DEPENDS(PUBKEY, KEY_RSA),
 		PLUGIN_REGISTER(PUBKEY, pem_public_key_load, FALSE),
 			PLUGIN_PROVIDE(PUBKEY, KEY_ECDSA),
+				PLUGIN_DEPENDS(PUBKEY, KEY_ECDSA),
 		PLUGIN_REGISTER(PUBKEY, pem_public_key_load, FALSE),
 			PLUGIN_PROVIDE(PUBKEY, KEY_DSA),
+				PLUGIN_DEPENDS(PUBKEY, KEY_DSA),
 
 		/* certificate PEM decoding */
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_ANY),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_ANY),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_X509),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_X509),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_CRL),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_X509_CRL),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_OCSP_REQUEST),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_X509_OCSP_REQUEST),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_OCSP_RESPONSE),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_X509_OCSP_RESPONSE),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_X509_AC),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_X509_AC),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_PKCS10_REQUEST),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_PKCS10_REQUEST),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_TRUSTED_PUBKEY),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_TRUSTED_PUBKEY),
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),
 			PLUGIN_PROVIDE(CERT_DECODE, CERT_GPG),
+				PLUGIN_DEPENDS(CERT_DECODE, CERT_GPG),
 
 		/* pluto specific certificate formats */
 		PLUGIN_REGISTER(CERT_DECODE, pem_certificate_load, FALSE),