Changed plugin constructors from plugin_create to plugin_name_plugin_create.

diff --git a/src/charon/plugins/android/android_plugin.c b/src/charon/plugins/android/android_plugin.c
index ea36ac4ed9aa0c2dd126c8295403f9b4ad4ccaa3..f21066a270652c3d37f9efce114dc4879720ea06 100644 (file)
--- a/src/charon/plugins/android/android_plugin.c
+++ b/src/charon/plugins/android/android_plugin.c
@@ -48,7 +48,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *plugin_create()
+plugin_t *android_plugin_create()
 {
        private_android_plugin_t *this;
 

diff --git a/src/charon/plugins/attr/attr_plugin.c b/src/charon/plugins/attr/attr_plugin.c
index 6dfb102714e775cbd615bf1f0982fc26c8af6b24..9325fc1521bacd421488fc4ae3ad4ead729d2cee 100644 (file)
--- a/src/charon/plugins/attr/attr_plugin.c
+++ b/src/charon/plugins/attr/attr_plugin.c
@@ -49,7 +49,7 @@ static void destroy(private_attr_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *attr_plugin_create()
 {
        private_attr_plugin_t *this = malloc_thing(private_attr_plugin_t);
 

diff --git a/src/charon/plugins/eap_aka/eap_aka_plugin.c b/src/charon/plugins/eap_aka/eap_aka_plugin.c
index c44a08966cdd9aa719798bf871abb1c0707197bf..f9283393a755f08f655dc9eafb9dff0fe83b4f12 100644 (file)
--- a/src/charon/plugins/eap_aka/eap_aka_plugin.c
+++ b/src/charon/plugins/eap_aka/eap_aka_plugin.c
@@ -35,7 +35,7 @@ static void destroy(eap_aka_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_aka_plugin_create()
 {
        eap_aka_plugin_t *this = malloc_thing(eap_aka_plugin_t);
 

diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c b/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
index 5286e098609082dbd7d2bef0d634e097cdddc1dc..626e83311c83138e254fe2032238d157cfe495e0 100644 (file)
--- a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
+++ b/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c
@@ -64,7 +64,7 @@ static void destroy(private_eap_aka_3gpp2_t *this)
 /**
  * See header
  */
-plugin_t *plugin_create()
+plugin_t *eap_aka_3gpp2_plugin_create()
 {
        private_eap_aka_3gpp2_t *this = malloc_thing(private_eap_aka_3gpp2_t);
 

diff --git a/src/charon/plugins/eap_gtc/eap_gtc_plugin.c b/src/charon/plugins/eap_gtc/eap_gtc_plugin.c
index 8550c254c2d36a06b1e61b3cc8e1c4fa291266c8..91ba84b3d361dc0cbcd791aa018455a97c09cb1d 100644 (file)
--- a/src/charon/plugins/eap_gtc/eap_gtc_plugin.c
+++ b/src/charon/plugins/eap_gtc/eap_gtc_plugin.c
@@ -37,7 +37,7 @@ static void destroy(eap_gtc_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_gtc_plugin_create()
 {
        eap_gtc_plugin_t *this = malloc_thing(eap_gtc_plugin_t);
 

diff --git a/src/charon/plugins/eap_identity/eap_identity_plugin.c b/src/charon/plugins/eap_identity/eap_identity_plugin.c
index a623e195175ef0b741215e6793d521191514bf57..0829971542ad4b2bfb3007fe4192c14e505b7647 100644 (file)
--- a/src/charon/plugins/eap_identity/eap_identity_plugin.c
+++ b/src/charon/plugins/eap_identity/eap_identity_plugin.c
@@ -34,7 +34,7 @@ static void destroy(eap_identity_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_identity_plugin_create()
 {
        eap_identity_plugin_t *this = malloc_thing(eap_identity_plugin_t);
 

diff --git a/src/charon/plugins/eap_md5/eap_md5_plugin.c b/src/charon/plugins/eap_md5/eap_md5_plugin.c
index 629255ebf73d26094594c0a6970e06b9c6392c29..e716dc6e81faba83a115f90501b8a46c18b0c389 100644 (file)
--- a/src/charon/plugins/eap_md5/eap_md5_plugin.c
+++ b/src/charon/plugins/eap_md5/eap_md5_plugin.c
@@ -34,7 +34,7 @@ static void destroy(eap_md5_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_md5_plugin_create()
 {
        eap_md5_plugin_t *this = malloc_thing(eap_md5_plugin_t);
 

diff --git a/src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.c b/src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
index 404cecb2074f160fbabf58ef18b6cf7d357d73e0..a7b41ddbf75fd193c87df8f5d0dd36be1d080c1a 100644 (file)
--- a/src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
+++ b/src/charon/plugins/eap_mschapv2/eap_mschapv2_plugin.c
@@ -34,7 +34,7 @@ static void destroy(eap_mschapv2_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_mschapv2_plugin_create()
 {
        eap_mschapv2_plugin_t *this = malloc_thing(eap_mschapv2_plugin_t);
 

diff --git a/src/charon/plugins/eap_radius/eap_radius_plugin.c b/src/charon/plugins/eap_radius/eap_radius_plugin.c
index 51e6a69c85571dbba4e9d1dd3b6fc65c01b1268f..7d2788c3e9394537739e18fa87cdaccb10ef8c3d 100644 (file)
--- a/src/charon/plugins/eap_radius/eap_radius_plugin.c
+++ b/src/charon/plugins/eap_radius/eap_radius_plugin.c
@@ -33,7 +33,7 @@ static void destroy(eap_radius_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_radius_plugin_create()
 {
        eap_radius_plugin_t *this;
 

diff --git a/src/charon/plugins/eap_sim/eap_sim_plugin.c b/src/charon/plugins/eap_sim/eap_sim_plugin.c
index 1d2b9cf4f22de74bebb32d2a42034f12ebb066e3..f0c972253fb3f2de55d9a39991059c46a3e1a0ed 100644 (file)
--- a/src/charon/plugins/eap_sim/eap_sim_plugin.c
+++ b/src/charon/plugins/eap_sim/eap_sim_plugin.c
@@ -35,7 +35,7 @@ static void destroy(eap_sim_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *eap_sim_plugin_create()
 {
        eap_sim_plugin_t *this = malloc_thing(eap_sim_plugin_t);
 

diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c b/src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c
index 22ad31703c5b9daac47f40a4eb108c42c6021e40..4f25c35eaa3605684d6ecd7227793c3a62130386 100644 (file)
--- a/src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c
+++ b/src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c
@@ -19,7 +19,7 @@
 #include "eap_sim_file_triplets.h"
 
 #include <daemon.h>
-\r
+
 #define TRIPLET_FILE IPSEC_CONFDIR "/ipsec.d/triplets.dat"
 
 typedef struct private_eap_sim_file_t private_eap_sim_file_t;
@@ -66,7 +66,7 @@ static void destroy(private_eap_sim_file_t *this)
 /**
  * See header
  */
-plugin_t *plugin_create()
+plugin_t *eap_sim_file_plugin_create()
 {
        private_eap_sim_file_t *this = malloc_thing(private_eap_sim_file_t);
 

diff --git a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c b/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
index e4e179a7d13816b6113a2a06ef4574c366e21f11..81b9d7b00c90015dbc5e14f675a8b345722ade0b 100644 (file)
--- a/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
+++ b/src/charon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c
@@ -57,7 +57,7 @@ static void destroy(private_eap_simaka_pseudonym_t *this)
 /**
  * See header
  */
-plugin_t *plugin_create()
+plugin_t *eap_simaka_pseudonym_plugin_create()
 {
        private_eap_simaka_pseudonym_t *this;
 

diff --git a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c b/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
index b2e853e2199eb45faabd2736d99d112eb89bbf21..987a0e1090e0224474fa27a79e795b5e1903379f 100644 (file)
--- a/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
+++ b/src/charon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c
@@ -57,7 +57,7 @@ static void destroy(private_eap_simaka_reauth_t *this)
 /**
  * See header
  */
-plugin_t *plugin_create()
+plugin_t *eap_simaka_reauth_plugin_create()
 {
        private_eap_simaka_reauth_t *this = malloc_thing(private_eap_simaka_reauth_t);
 

diff --git a/src/charon/plugins/kernel_klips/kernel_klips_plugin.c b/src/charon/plugins/kernel_klips/kernel_klips_plugin.c
index b0117c10c3cd398a527ba7979ce7beb60b3db11d..fa5e9eb29b74c3ea50a767a9ecd34dba8795445f 100644 (file)
--- a/src/charon/plugins/kernel_klips/kernel_klips_plugin.c
+++ b/src/charon/plugins/kernel_klips/kernel_klips_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_kernel_klips_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *kernel_klips_plugin_create()
 {
        private_kernel_klips_plugin_t *this = malloc_thing(private_kernel_klips_plugin_t);
 

diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_plugin.c b/src/charon/plugins/kernel_netlink/kernel_netlink_plugin.c
index cdf20f14a5db2bd1335011f1bee021bd11f39058..4c61265aa351e679ccb1b0cbf344602e431edf75 100644 (file)
--- a/src/charon/plugins/kernel_netlink/kernel_netlink_plugin.c
+++ b/src/charon/plugins/kernel_netlink/kernel_netlink_plugin.c
@@ -46,7 +46,7 @@ static void destroy(private_kernel_netlink_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *kernel_netlink_plugin_create()
 {
        private_kernel_netlink_plugin_t *this = malloc_thing(private_kernel_netlink_plugin_t);
 

diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.c b/src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.c
index 3380c328c375532700865cdd70976d262b1801ae..b84ccf150aa54896664ccdaddc3066406660e99c 100644 (file)
--- a/src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.c
+++ b/src/charon/plugins/kernel_pfkey/kernel_pfkey_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_kernel_pfkey_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *kernel_pfkey_plugin_create()
 {
        private_kernel_pfkey_plugin_t *this = malloc_thing(private_kernel_pfkey_plugin_t);
 

diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.c b/src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.c
index e73cbeafb5341caaa8c501f3332aa8357a36ad18..97139fb56149e332e417f23de3dc6bfb69274159 100644 (file)
--- a/src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.c
+++ b/src/charon/plugins/kernel_pfroute/kernel_pfroute_plugin.c
@@ -45,7 +45,7 @@ static void destroy(private_kernel_pfroute_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *kernel_pfroute_plugin_create()
 {
        private_kernel_pfroute_plugin_t *this = malloc_thing(private_kernel_pfroute_plugin_t);
 

diff --git a/src/charon/plugins/load_tester/load_tester_plugin.c b/src/charon/plugins/load_tester/load_tester_plugin.c
index e25f974237c15b842a10c508b079b6802c0977b4..46145b803028a04ff564068075f274c123c4f3a9 100644 (file)
--- a/src/charon/plugins/load_tester/load_tester_plugin.c
+++ b/src/charon/plugins/load_tester/load_tester_plugin.c
@@ -173,7 +173,7 @@ static void destroy(private_load_tester_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *load_tester_plugin_create()
 {
        private_load_tester_plugin_t *this;
        u_int i, shutdown_on = 0;

diff --git a/src/charon/plugins/medcli/medcli_plugin.c b/src/charon/plugins/medcli/medcli_plugin.c
index 148eded618fbe9b73be6f7ff5e1672589eb7acf2..397168d46d1bf74c7575f26f6a3dfa216dd73654 100644 (file)
--- a/src/charon/plugins/medcli/medcli_plugin.c
+++ b/src/charon/plugins/medcli/medcli_plugin.c
@@ -72,7 +72,7 @@ static void destroy(private_medcli_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *medcli_plugin_create()
 {
        char *uri;
        private_medcli_plugin_t *this = malloc_thing(private_medcli_plugin_t);

diff --git a/src/charon/plugins/medsrv/medsrv_plugin.c b/src/charon/plugins/medsrv/medsrv_plugin.c
index 7c533f10e64f4a793b196c04e9ce198d582e33c3..262d26d6b20460126b49643c01d4a1b44a82740c 100644 (file)
--- a/src/charon/plugins/medsrv/medsrv_plugin.c
+++ b/src/charon/plugins/medsrv/medsrv_plugin.c
@@ -64,7 +64,7 @@ static void destroy(private_medsrv_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *medsrv_plugin_create()
 {
        char *uri;
        private_medsrv_plugin_t *this = malloc_thing(private_medsrv_plugin_t);

diff --git a/src/charon/plugins/nm/nm_plugin.c b/src/charon/plugins/nm/nm_plugin.c
index daf2cc66007684232490ce6294e57c7be286be05..f2abcaf495c80cb4ecf182cc7c1cf8446192c1a7 100644 (file)
--- a/src/charon/plugins/nm/nm_plugin.c
+++ b/src/charon/plugins/nm/nm_plugin.c
@@ -93,7 +93,7 @@ static void destroy(private_nm_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *nm_plugin_create()
 {
        private_nm_plugin_t *this = malloc_thing(private_nm_plugin_t);
 

diff --git a/src/charon/plugins/resolve/resolve_plugin.c b/src/charon/plugins/resolve/resolve_plugin.c
index c564981ef94b9817393c3f0560abccda1245982e..4bc9a2ba800aa997a45a3d57286f7a0520d7d4a0 100644 (file)
--- a/src/charon/plugins/resolve/resolve_plugin.c
+++ b/src/charon/plugins/resolve/resolve_plugin.c
@@ -49,7 +49,7 @@ static void destroy(private_resolve_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *resolve_plugin_create()
 {
        private_resolve_plugin_t *this = malloc_thing(private_resolve_plugin_t);
 

diff --git a/src/charon/plugins/smp/smp.c b/src/charon/plugins/smp/smp.c
index 21e682a0ac97160c35dddd2baaa9988a04714d61..64820eb459ec7db49f83efef3c532b11bf7fad54 100644 (file)
--- a/src/charon/plugins/smp/smp.c
+++ b/src/charon/plugins/smp/smp.c
@@ -720,7 +720,7 @@ static void destroy(private_smp_t *this)
 /*
  * Described in header file
  */
-plugin_t *plugin_create()
+plugin_t *smp_plugin_create()
 {
        struct sockaddr_un unix_addr = { AF_UNIX, IPSEC_PIDDIR "/charon.xml"};
        private_smp_t *this = malloc_thing(private_smp_t);

diff --git a/src/charon/plugins/socket_default/socket_default_plugin.c b/src/charon/plugins/socket_default/socket_default_plugin.c
index 4f455b418465c5b35cb466babe30f1c02ff765d0..45390ddaeb6178fb5e2e093a2158ba18ed6fee39 100644 (file)
--- a/src/charon/plugins/socket_default/socket_default_plugin.c
+++ b/src/charon/plugins/socket_default/socket_default_plugin.c
@@ -48,7 +48,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *socket_default_plugin_create()
 {
        private_socket_default_plugin_t *this;
 

diff --git a/src/charon/plugins/socket_dynamic/socket_dynamic_plugin.c b/src/charon/plugins/socket_dynamic/socket_dynamic_plugin.c
index 50955dcf5eebd7e16d0c1918e0fc7cf9cb5ebe5a..3410fc7a4cd7158f03ac9150443ac905571c908e 100644 (file)
--- a/src/charon/plugins/socket_dynamic/socket_dynamic_plugin.c
+++ b/src/charon/plugins/socket_dynamic/socket_dynamic_plugin.c
@@ -48,7 +48,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *socket_dynamic_plugin_create()
 {
        private_socket_dynamic_plugin_t *this;
 

diff --git a/src/charon/plugins/socket_raw/socket_raw_plugin.c b/src/charon/plugins/socket_raw/socket_raw_plugin.c
index 76eb71fc19ec6522a1d11465ea8cdee5a04aa5b0..5b011abcf9b82083542036c044600fce8feb48f7 100644 (file)
--- a/src/charon/plugins/socket_raw/socket_raw_plugin.c
+++ b/src/charon/plugins/socket_raw/socket_raw_plugin.c
@@ -48,7 +48,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *socket_raw_plugin_create()
 {
        private_socket_raw_plugin_t *this;
 

diff --git a/src/charon/plugins/sql/sql_plugin.c b/src/charon/plugins/sql/sql_plugin.c
index e2e410a8abaec1c586232e55bbdce8ed74c877f0..e2d2d63b39b48a686ba253b9d9f9ee8dc6ceae8b 100644 (file)
--- a/src/charon/plugins/sql/sql_plugin.c
+++ b/src/charon/plugins/sql/sql_plugin.c
@@ -71,7 +71,7 @@ static void destroy(private_sql_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *sql_plugin_create()
 {
        char *uri;
        private_sql_plugin_t *this;

diff --git a/src/charon/plugins/stroke/stroke_plugin.c b/src/charon/plugins/stroke/stroke_plugin.c
index 61ae1095389e7679376c0811c48a937e8e011c84..4361e5050274122135f2600499330b95766490b6 100644 (file)
--- a/src/charon/plugins/stroke/stroke_plugin.c
+++ b/src/charon/plugins/stroke/stroke_plugin.c
@@ -48,7 +48,7 @@ static void destroy(private_stroke_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *stroke_plugin_create()
 {
        private_stroke_plugin_t *this = malloc_thing(private_stroke_plugin_t);
 

diff --git a/src/charon/plugins/uci/uci_plugin.c b/src/charon/plugins/uci/uci_plugin.c
index 2a79b91091e90c98273ff4c6dba061d22c8bde62..742fcf4d07319ac57aae8381ff94666d8be755aa 100644 (file)
--- a/src/charon/plugins/uci/uci_plugin.c
+++ b/src/charon/plugins/uci/uci_plugin.c
@@ -75,7 +75,7 @@ static void destroy(private_uci_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *uci_plugin_create()
 {
        private_uci_plugin_t *this = malloc_thing(private_uci_plugin_t);
 

diff --git a/src/charon/plugins/unit_tester/unit_tester.c b/src/charon/plugins/unit_tester/unit_tester.c
index 3c39688c6940c67ab294b6c2ee33a70d5de82c3a..5f6f94e031b15a81d7fd7b6cb7509a96e638347c 100644 (file)
--- a/src/charon/plugins/unit_tester/unit_tester.c
+++ b/src/charon/plugins/unit_tester/unit_tester.c
@@ -103,7 +103,7 @@ static void destroy(private_unit_tester_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *unit_tester_plugin_create()
 {
        private_unit_tester_t *this = malloc_thing(private_unit_tester_t);
 

diff --git a/src/charon/plugins/updown/updown_plugin.c b/src/charon/plugins/updown/updown_plugin.c
index 6cb0efdcd73fd19eeeae6b64dfe595806cca4df8..9d0591e62964eb6046290ccc0822eeef98318402 100644 (file)
--- a/src/charon/plugins/updown/updown_plugin.c
+++ b/src/charon/plugins/updown/updown_plugin.c
@@ -49,7 +49,7 @@ static void destroy(private_updown_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *updown_plugin_create()
 {
        private_updown_plugin_t *this = malloc_thing(private_updown_plugin_t);
 

diff --git a/src/libstrongswan/plugins/aes/aes_plugin.c b/src/libstrongswan/plugins/aes/aes_plugin.c
index c6215cc7f419fe91597d9c53be2c44caec82eec8..1e920f8ccdd95a40cef10dd82be33aa76ff82811 100644 (file)
--- a/src/libstrongswan/plugins/aes/aes_plugin.c
+++ b/src/libstrongswan/plugins/aes/aes_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_aes_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *aes_plugin_create()
 {
        private_aes_plugin_t *this = malloc_thing(private_aes_plugin_t);
 

diff --git a/src/libstrongswan/plugins/agent/agent_plugin.c b/src/libstrongswan/plugins/agent/agent_plugin.c
index 299b2cc1d2190c2c62b7ef8fffa1de760d078ebb..d40b437bbe2b486b639f154665aabebde5d09d96 100644 (file)
--- a/src/libstrongswan/plugins/agent/agent_plugin.c
+++ b/src/libstrongswan/plugins/agent/agent_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_agent_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *agent_plugin_create()
 {
        private_agent_plugin_t *this = malloc_thing(private_agent_plugin_t);
 

diff --git a/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c b/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c
index 66b309c675250aae1c9760dcf80a87c8ac12712f..5d3d737bd050141b6ad98db05267c471146328c6 100644 (file)
--- a/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c
+++ b/src/libstrongswan/plugins/attr_sql/attr_sql_plugin.c
@@ -57,7 +57,7 @@ static void destroy(private_attr_sql_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *attr_sql_plugin_create()
 {
        char *uri;
        private_attr_sql_plugin_t *this;

diff --git a/src/libstrongswan/plugins/blowfish/blowfish_plugin.c b/src/libstrongswan/plugins/blowfish/blowfish_plugin.c
index 993dc8b3b98d4cb3c5fb9cb2177daf8d8727dbe2..f9fb605b351a6b68f5171879344de7c72179839f 100644 (file)
--- a/src/libstrongswan/plugins/blowfish/blowfish_plugin.c
+++ b/src/libstrongswan/plugins/blowfish/blowfish_plugin.c
@@ -45,7 +45,7 @@ static void destroy(private_blowfish_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *blowfish_plugin_create()
 {
        private_blowfish_plugin_t *this = malloc_thing(private_blowfish_plugin_t);
 

diff --git a/src/libstrongswan/plugins/curl/curl_plugin.c b/src/libstrongswan/plugins/curl/curl_plugin.c
index 13dfa053f3075f570da444233845076197a3660b..b08d54cc39d10607f7173554202c071291506b75 100644 (file)
--- a/src/libstrongswan/plugins/curl/curl_plugin.c
+++ b/src/libstrongswan/plugins/curl/curl_plugin.c
@@ -48,7 +48,7 @@ static void destroy(private_curl_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *curl_plugin_create()
 {
        CURLcode res;
        private_curl_plugin_t *this = malloc_thing(private_curl_plugin_t);

diff --git a/src/libstrongswan/plugins/des/des_plugin.c b/src/libstrongswan/plugins/des/des_plugin.c
index 649d224aba90affd8af6c664a7f8d2fc46984af4..afc82e8d4160530473f87533698571d4e530bfb8 100644 (file)
--- a/src/libstrongswan/plugins/des/des_plugin.c
+++ b/src/libstrongswan/plugins/des/des_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_des_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *des_plugin_create()
 {
        private_des_plugin_t *this = malloc_thing(private_des_plugin_t);
 

diff --git a/src/libstrongswan/plugins/dnskey/dnskey_plugin.c b/src/libstrongswan/plugins/dnskey/dnskey_plugin.c
index 83dbe31a1379ee73ba0cef4023ada7e2942c8c93..125047b0538a3910235a2720b8186e4efbb43826 100644 (file)
--- a/src/libstrongswan/plugins/dnskey/dnskey_plugin.c
+++ b/src/libstrongswan/plugins/dnskey/dnskey_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_dnskey_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *dnskey_plugin_create()
 {
        private_dnskey_plugin_t *this = malloc_thing(private_dnskey_plugin_t);
 

diff --git a/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c b/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
index 6c0842f81f741c80c280b92274761e6c2e3779d6..f41265637f4b5a84e1fb5e2620af2b25cfa516a8 100644 (file)
--- a/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
+++ b/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_fips_prf_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *fips_prf_plugin_create()
 {
        private_fips_prf_plugin_t *this = malloc_thing(private_fips_prf_plugin_t);
 

diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
index 8c9ea893b2b6038d8c995442a6aadba01b703c32..c87f3b8824cf0b0fa66281055b0f678981a0a30a 100644 (file)
--- a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
+++ b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
@@ -118,7 +118,7 @@ static void destroy(private_gcrypt_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *gcrypt_plugin_create()
 {
        private_gcrypt_plugin_t *this;
 

diff --git a/src/libstrongswan/plugins/gmp/gmp_plugin.c b/src/libstrongswan/plugins/gmp/gmp_plugin.c
index b70ff881c586d9b4510bf9bd4fbd53a6a2c0056c..ca50514f78f4acc174256efa040c999a3fec0806 100644 (file)
--- a/src/libstrongswan/plugins/gmp/gmp_plugin.c
+++ b/src/libstrongswan/plugins/gmp/gmp_plugin.c
@@ -52,7 +52,7 @@ static void destroy(private_gmp_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *gmp_plugin_create()
 {
        private_gmp_plugin_t *this = malloc_thing(private_gmp_plugin_t);
 

diff --git a/src/libstrongswan/plugins/hmac/hmac_plugin.c b/src/libstrongswan/plugins/hmac/hmac_plugin.c
index 94332ee36666d3acba77cd324c91d61894170f3e..e6b9f7a74dfc26cd5e5d79260b36310a0f08c08e 100644 (file)
--- a/src/libstrongswan/plugins/hmac/hmac_plugin.c
+++ b/src/libstrongswan/plugins/hmac/hmac_plugin.c
@@ -47,7 +47,7 @@ static void destroy(private_hmac_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *hmac_plugin_create()
 {
        private_hmac_plugin_t *this = malloc_thing(private_hmac_plugin_t);
 

diff --git a/src/libstrongswan/plugins/ldap/ldap_plugin.c b/src/libstrongswan/plugins/ldap/ldap_plugin.c
index a31308bbf29f40cf8afea410a1a34f1353a84834..372ac9f939cd1fe3156f37cafe58f8e3c1e91f26 100644 (file)
--- a/src/libstrongswan/plugins/ldap/ldap_plugin.c
+++ b/src/libstrongswan/plugins/ldap/ldap_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_ldap_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *ldap_plugin_create()
 {
        private_ldap_plugin_t *this = malloc_thing(private_ldap_plugin_t);
 

diff --git a/src/libstrongswan/plugins/md4/md4_plugin.c b/src/libstrongswan/plugins/md4/md4_plugin.c
index ba4041d2df2205319b6d34ce0d6c5442cfb624a2..38ae0d4bcc1b172bc477371cba912383149eb3a5 100644 (file)
--- a/src/libstrongswan/plugins/md4/md4_plugin.c
+++ b/src/libstrongswan/plugins/md4/md4_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_md4_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *md4_plugin_create()
 {
        private_md4_plugin_t *this = malloc_thing(private_md4_plugin_t);
 

diff --git a/src/libstrongswan/plugins/md5/md5_plugin.c b/src/libstrongswan/plugins/md5/md5_plugin.c
index 7592c20df8d4dc41f9f24c1d161755255f9bfed7..cfbf6acea56582dd39eea3e7098e7a82607e4342 100644 (file)
--- a/src/libstrongswan/plugins/md5/md5_plugin.c
+++ b/src/libstrongswan/plugins/md5/md5_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_md5_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *md5_plugin_create()
 {
        private_md5_plugin_t *this = malloc_thing(private_md5_plugin_t);
 

diff --git a/src/libstrongswan/plugins/mysql/mysql_plugin.c b/src/libstrongswan/plugins/mysql/mysql_plugin.c
index 0e64bbc3dd8d445ee3f897cbcf55de0c6210aa39..44f952cb76ea9da5e58cfee805e288007c1a3f00 100644 (file)
--- a/src/libstrongswan/plugins/mysql/mysql_plugin.c
+++ b/src/libstrongswan/plugins/mysql/mysql_plugin.c
@@ -46,7 +46,7 @@ static void destroy(private_mysql_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *mysql_plugin_create()
 {
        private_mysql_plugin_t *this;
 

diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c
index 548a76bb4838618eeba114feceb6a6f3a61ca03b..941b643cfb0acb2d1f6c43e99a63b911fc8c5558 100644 (file)
--- a/src/libstrongswan/plugins/openssl/openssl_plugin.c
+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -201,7 +201,7 @@ static void destroy(private_openssl_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *openssl_plugin_create()
 {
        private_openssl_plugin_t *this = malloc_thing(private_openssl_plugin_t);
 

diff --git a/src/libstrongswan/plugins/padlock/padlock_plugin.c b/src/libstrongswan/plugins/padlock/padlock_plugin.c
index 32b18ec4bbd7f571eb217760fd8a328df604f38f..2225318af5b787f59f10bea911948582fc77f827 100644 (file)
--- a/src/libstrongswan/plugins/padlock/padlock_plugin.c
+++ b/src/libstrongswan/plugins/padlock/padlock_plugin.c
@@ -131,7 +131,7 @@ static void destroy(private_padlock_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *padlock_plugin_create()
 {
        private_padlock_plugin_t *this = malloc_thing(private_padlock_plugin_t);
 

diff --git a/src/libstrongswan/plugins/pem/pem_plugin.c b/src/libstrongswan/plugins/pem/pem_plugin.c
index 5a5149ca83b2a0d595f6b37245f7fefc8ae85e8f..b76987272df5479563513774a4b9176b254f9b23 100644 (file)
--- a/src/libstrongswan/plugins/pem/pem_plugin.c
+++ b/src/libstrongswan/plugins/pem/pem_plugin.c
@@ -48,7 +48,7 @@ static void destroy(private_pem_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *pem_plugin_create()
 {
        private_pem_plugin_t *this = malloc_thing(private_pem_plugin_t);
 

diff --git a/src/libstrongswan/plugins/pgp/pgp_plugin.c b/src/libstrongswan/plugins/pgp/pgp_plugin.c
index eabb3695f735a5386160fcdcf6a737aae85d1322..3ed1faf01a665ec6a939a2558f78c363dfebfad9 100644 (file)
--- a/src/libstrongswan/plugins/pgp/pgp_plugin.c
+++ b/src/libstrongswan/plugins/pgp/pgp_plugin.c
@@ -54,7 +54,7 @@ static void destroy(private_pgp_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *pgp_plugin_create()
 {
        private_pgp_plugin_t *this = malloc_thing(private_pgp_plugin_t);
 

diff --git a/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c b/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
index 9d71e13887e2f616f3dd8826ee99fa617a02cd6a..35ec2d2bf3a8bc371f819c75cae815ee4396bc97 100644 (file)
--- a/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
+++ b/src/libstrongswan/plugins/pkcs1/pkcs1_plugin.c
@@ -50,7 +50,7 @@ static void destroy(private_pkcs1_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *pkcs1_plugin_create()
 {
        private_pkcs1_plugin_t *this = malloc_thing(private_pkcs1_plugin_t);
 

diff --git a/src/libstrongswan/plugins/plugin.h b/src/libstrongswan/plugins/plugin.h
index 28c800c0c428c612549e98ef5b398c5be0595fee..6d8a370fb17c3d60cd0236a65709b1e661bc7605 100644 (file)
--- a/src/libstrongswan/plugins/plugin.h
+++ b/src/libstrongswan/plugins/plugin.h
@@ -38,9 +38,9 @@ struct plugin_t {
 /**
  * Plugin constructor function definiton.
  *
- * Each plugin has a constructor functions. This function is called on daemon
+ * Each plugin has a constructor function. This function is called on daemon
  * startup to initialize each plugin.
- * The plugin function is named plugin_create().
+ * The plugin function is named plugin_name_plugin_create().
  *
  * @return                             plugin_t instance
  */

diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index d4513f25ae1cd1ccb3a7bdc2572580adc83f1b4c..fb970b4d781708db29909d4f167855813020c818 100644 (file)
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2010 Tobias Brunner
  * Copyright (C) 2007 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -49,19 +50,43 @@ struct private_plugin_loader_t {
        linked_list_t *names;
 };
 
+/**
+ * Replace '-' with '_' to use str as identifier.
+ */
+static char* sanitize(char *str)
+{
+       char *pos = str;
+       while (pos && *pos)
+       {
+               if (*pos == '-')
+               {
+                       *pos = '_';
+               }
+               pos++;
+       }
+       return str;
+}
+
 /**
  * load a single plugin
  */
 static plugin_t* load_plugin(private_plugin_loader_t *this,
                                                         char *path, char *name)
 {
+       char create[128];
        char file[PATH_MAX];
        void *handle;
        plugin_t *plugin;
        plugin_constructor_t constructor;
 
-       snprintf(file, sizeof(file), "%s/libstrongswan-%s.so", path, name);
-
+       if (snprintf(file, sizeof(file), "%s/libstrongswan-%s.so", path,
+                                name) >= sizeof(file) ||
+               snprintf(create, sizeof(create), "%s_plugin_create",
+                                name) >= sizeof(create))
+       {
+               return NULL;
+       }
+       sanitize(create);
        if (lib->integrity)
        {
                if (!lib->integrity->check_file(lib->integrity, name, file))
@@ -76,10 +101,10 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
                DBG1("plugin '%s': failed to load '%s' - %s", name, file, dlerror());
                return NULL;
        }
-       constructor = dlsym(handle, "plugin_create");
+       constructor = dlsym(handle, create);
        if (constructor == NULL)
        {
-               DBG1("plugin '%s': failed to load - no plugin_create() function", name);
+               DBG1("plugin '%s': failed to load - %s not found", name, create);
                dlclose(handle);
                return NULL;
        }
@@ -96,7 +121,7 @@ static plugin_t* load_plugin(private_plugin_loader_t *this,
        plugin = constructor();
        if (plugin == NULL)
        {
-               DBG1("plugin '%s': failed to load - plugin_create() returned NULL", name);
+               DBG1("plugin '%s': failed to load - %s returned NULL", name, create);
                dlclose(handle);
                return NULL;
        }

diff --git a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
index ad84eed9987e122d95a39a286a53d8dc885befca..b0eabc9eeba420a615df070be2a67da3545c6c36 100644 (file)
--- a/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
+++ b/src/libstrongswan/plugins/pubkey/pubkey_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_pubkey_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *pubkey_plugin_create()
 {
        private_pubkey_plugin_t *this = malloc_thing(private_pubkey_plugin_t);
 

diff --git a/src/libstrongswan/plugins/random/random_plugin.c b/src/libstrongswan/plugins/random/random_plugin.c
index df0a8f5566d8b457390d85cd6b99b9b59a53bbe5..39678ba7147a1706fa406cbea536a0cd306606da 100644 (file)
--- a/src/libstrongswan/plugins/random/random_plugin.c
+++ b/src/libstrongswan/plugins/random/random_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_random_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *random_plugin_create()
 {
        private_random_plugin_t *this = malloc_thing(private_random_plugin_t);
 

diff --git a/src/libstrongswan/plugins/sha1/sha1_plugin.c b/src/libstrongswan/plugins/sha1/sha1_plugin.c
index a038228dae2e2646d994071765c023401f560960..7b9cf878f5c090a9c4a081145b91308a57d57715 100644 (file)
--- a/src/libstrongswan/plugins/sha1/sha1_plugin.c
+++ b/src/libstrongswan/plugins/sha1/sha1_plugin.c
@@ -47,7 +47,7 @@ static void destroy(private_sha1_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *sha1_plugin_create()
 {
        private_sha1_plugin_t *this = malloc_thing(private_sha1_plugin_t);
 

diff --git a/src/libstrongswan/plugins/sha2/sha2_plugin.c b/src/libstrongswan/plugins/sha2/sha2_plugin.c
index 90f7cec776b93043dcbbe155cb136225bbee744e..810d9922ac6f0baf42f0ab4a58240cc377bc76e6 100644 (file)
--- a/src/libstrongswan/plugins/sha2/sha2_plugin.c
+++ b/src/libstrongswan/plugins/sha2/sha2_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_sha2_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *sha2_plugin_create()
 {
        private_sha2_plugin_t *this = malloc_thing(private_sha2_plugin_t);
 

diff --git a/src/libstrongswan/plugins/sqlite/sqlite_plugin.c b/src/libstrongswan/plugins/sqlite/sqlite_plugin.c
index 955402bf941d8d92cda40b112ff7170058ba7826..332d8231803e4b8358cb3dfe4b766e7af48a9125 100644 (file)
--- a/src/libstrongswan/plugins/sqlite/sqlite_plugin.c
+++ b/src/libstrongswan/plugins/sqlite/sqlite_plugin.c
@@ -44,7 +44,7 @@ static void destroy(private_sqlite_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *sqlite_plugin_create()
 {
        private_sqlite_plugin_t *this = malloc_thing(private_sqlite_plugin_t);
 

diff --git a/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c b/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
index 7ad8c3c737712fbc4cc337e6c2f59e0911a08f2f..234d237f3950116db631564cb7d85067696d073a 100644 (file)
--- a/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
+++ b/src/libstrongswan/plugins/test_vectors/test_vectors_plugin.c
@@ -104,7 +104,7 @@ static void destroy(private_test_vectors_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *test_vectors_plugin_create()
 {
        private_test_vectors_plugin_t *this = malloc_thing(private_test_vectors_plugin_t);
        int i;

diff --git a/src/libstrongswan/plugins/x509/x509_plugin.c b/src/libstrongswan/plugins/x509/x509_plugin.c
index 94c49b1e123be35bac7f2604f1cf75ab221bef2f..e71c55efcb34db403c9ad522cf8f4c6b3b00f21c 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_plugin.c
+++ b/src/libstrongswan/plugins/x509/x509_plugin.c
@@ -65,7 +65,7 @@ static void destroy(private_x509_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *x509_plugin_create()
 {
        private_x509_plugin_t *this = malloc_thing(private_x509_plugin_t);
 

diff --git a/src/libstrongswan/plugins/xcbc/xcbc_plugin.c b/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
index 3eb7f09271d86a5ceebd58ec511301e44269e7c3..9d903bfaa85af6c569d732255e8494965aa7d581 100644 (file)
--- a/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
+++ b/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
@@ -47,7 +47,7 @@ static void destroy(private_xcbc_plugin_t *this)
 /*
  * see header file
  */
-plugin_t *plugin_create()
+plugin_t *xcbc_plugin_create()
 {
        private_xcbc_plugin_t *this = malloc_thing(private_xcbc_plugin_t);