Changed plugin constructors from plugin_create to plugin_name_plugin_create.

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;
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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;
 

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);
 

src/charon/plugins/eap_sim_file/eap_sim_file_plugin.c

@@ -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);
 

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;
 

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);
 

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);
 

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);
 

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);
 

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);
 

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;

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);

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);

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);
 

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);
 

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);

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;
 

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;
 

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;
 

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;

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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;

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);
 

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);

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);
 

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);
 

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);
 

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;
 

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);
 

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);
 

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);
 

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);
 

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);
 

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;
 

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);
 

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);
 

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);
 

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);
 

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);
 

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
  */

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;
 	}

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);
 

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);
 

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);
 

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);
 

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);
 

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;

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);
 

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);