Added a get_name() function to plugin_t, create_plugin_enumerator enumerates over plugin_t

src/libstrongswan/plugins/af_alg/af_alg_crypter.c

@@ -92,7 +92,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_crypter_probe()
+void af_alg_crypter_probe(char *plugin)
 {
 	encryption_algorithm_t prev = -1;
 	af_alg_ops_t *ops;
@@ -106,7 +106,7 @@ void af_alg_crypter_probe()
 			if (ops)
 			{
 				ops->destroy(ops);
-				lib->crypto->add_crypter(lib->crypto, algs[i].id, af_alg_plugin_name,
+				lib->crypto->add_crypter(lib->crypto, algs[i].id, plugin,
 								(crypter_constructor_t)af_alg_crypter_create);
 			}
 		}

src/libstrongswan/plugins/af_alg/af_alg_crypter.h

@@ -48,7 +48,9 @@ af_alg_crypter_t *af_alg_crypter_create(encryption_algorithm_t algo,
 
 /**
  * Probe algorithms and register af_alg_crypter_create().
+ *
+ * @param plugin		plugin name to register algorithms for
  */
-void af_alg_crypter_probe();
+void af_alg_crypter_probe(char *plugin);
 
 #endif /** AF_ALG_CRYPTER_H_ @}*/

src/libstrongswan/plugins/af_alg/af_alg_hasher.c

@@ -59,7 +59,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_hasher_probe()
+void af_alg_hasher_probe(char *plugin)
 {
 	af_alg_ops_t *ops;
 	int i;
@@ -70,7 +70,7 @@ void af_alg_hasher_probe()
 		if (ops)
 		{
 			ops->destroy(ops);
-			lib->crypto->add_hasher(lib->crypto, algs[i].id, af_alg_plugin_name,
+			lib->crypto->add_hasher(lib->crypto, algs[i].id, plugin,
 							(hasher_constructor_t)af_alg_hasher_create);
 		}
 	}

src/libstrongswan/plugins/af_alg/af_alg_hasher.h

@@ -46,7 +46,9 @@ af_alg_hasher_t *af_alg_hasher_create(hash_algorithm_t algo);
 
 /**
  * Probe algorithms and register af_alg_hasher_create().
+ *
+ * @param plugin		plugin name to register algorithms for
  */
-void af_alg_hasher_probe();
+void af_alg_hasher_probe(char *plugin);
 
 #endif /** af_alg_HASHER_H_ @}*/

src/libstrongswan/plugins/af_alg/af_alg_ops.c

@@ -21,8 +21,6 @@
 
 #include <debug.h>
 
-const char *af_alg_plugin_name = "af-alg";
-
 typedef struct private_af_alg_ops_t private_af_alg_ops_t;
 
 /**

src/libstrongswan/plugins/af_alg/af_alg_ops.h

@@ -33,8 +33,6 @@
 #define SOL_ALG 279
 #endif /* SOL_ALG */
 
-extern const char *af_alg_plugin_name;
-
 typedef struct af_alg_ops_t af_alg_ops_t;
 
 /**

src/libstrongswan/plugins/af_alg/af_alg_plugin.c

@@ -35,6 +35,12 @@ struct private_af_alg_plugin_t {
 	af_alg_plugin_t public;
 };
 
+METHOD(plugin_t, get_name, char*,
+	private_af_alg_plugin_t *this)
+{
+	return "af-alg";
+}
+
 METHOD(plugin_t, destroy, void,
 	private_af_alg_plugin_t *this)
 {
@@ -60,15 +66,16 @@ plugin_t *af_alg_plugin_create()
 	INIT(this,
 		.public = {
 			.plugin = {
+				.get_name = _get_name,
 				.destroy = _destroy,
 			},
 		},
 	);
 
-	af_alg_hasher_probe();
-	af_alg_signer_probe();
-	af_alg_prf_probe();
-	af_alg_crypter_probe();
+	af_alg_hasher_probe(get_name(this));
+	af_alg_signer_probe(get_name(this));
+	af_alg_prf_probe(get_name(this));
+	af_alg_crypter_probe(get_name(this));
 
 	return &this->public.plugin;
 }

src/libstrongswan/plugins/af_alg/af_alg_prf.c

@@ -70,7 +70,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_prf_probe()
+void af_alg_prf_probe(char *plugin)
 {
 	af_alg_ops_t *ops;
 	int i;
@@ -81,7 +81,7 @@ void af_alg_prf_probe()
 		if (ops)
 		{
 			ops->destroy(ops);
-			lib->crypto->add_prf(lib->crypto, algs[i].id, af_alg_plugin_name,
+			lib->crypto->add_prf(lib->crypto, algs[i].id, plugin,
 							(prf_constructor_t)af_alg_prf_create);
 		}
 	}

src/libstrongswan/plugins/af_alg/af_alg_prf.h

@@ -46,7 +46,9 @@ af_alg_prf_t *af_alg_prf_create(pseudo_random_function_t algo);
 
 /**
  * Probe algorithms and register af_alg_prf_create().
+ *
+ * @param plugin		plugin name to register algorithms for
  */
-void af_alg_prf_probe();
+void af_alg_prf_probe(char *plugin);
 
 #endif /** AF_ALG_PRF_H_ @}*/

src/libstrongswan/plugins/af_alg/af_alg_signer.c

@@ -71,7 +71,7 @@ static struct {
 /**
  * See header.
  */
-void af_alg_signer_probe()
+void af_alg_signer_probe(char *plugin)
 {
 	af_alg_ops_t *ops;
 	int i;
@@ -82,7 +82,7 @@ void af_alg_signer_probe()
 		if (ops)
 		{
 			ops->destroy(ops);
-			lib->crypto->add_signer(lib->crypto, algs[i].id, af_alg_plugin_name,
+			lib->crypto->add_signer(lib->crypto, algs[i].id, plugin,
 							(signer_constructor_t)af_alg_signer_create);
 		}
 	}

src/libstrongswan/plugins/af_alg/af_alg_signer.h

@@ -46,7 +46,9 @@ af_alg_signer_t *af_alg_signer_create(integrity_algorithm_t algo);
 
 /**
  * Probe algorithms and register af_alg_signer_create().
+ *
+ * @param plugin		plugin name to register algorithms for
  */
-void af_alg_signer_probe();
+void af_alg_signer_probe(char *plugin);
 
 #endif /** AF_ALG_SIGNER_H_ @}*/