7 files changed, 9 insertions, 5 deletions
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_crypter.c b/src/libstrongswan/plugins/af_alg/af_alg_crypter.c
index 77e41e3fa..3416ad8d2 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_crypter.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_crypter.c
@@ -105,7 +105,7 @@ void af_alg_crypter_probe()
 			if (ops)
 			{
 				ops->destroy(ops);
-				lib->crypto->add_crypter(lib->crypto, algs[i].id, "af_alg",
+				lib->crypto->add_crypter(lib->crypto, algs[i].id, af_alg_plugin_name,
 								(crypter_constructor_t)af_alg_crypter_create);
 			}
 		}
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_hasher.c b/src/libstrongswan/plugins/af_alg/af_alg_hasher.c
index 3c5d8daec..7c6297d44 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_hasher.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_hasher.c
@@ -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",
+			lib->crypto->add_hasher(lib->crypto, algs[i].id, af_alg_plugin_name,
 							(hasher_constructor_t)af_alg_hasher_create);
 		}
 	}
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_ops.c b/src/libstrongswan/plugins/af_alg/af_alg_ops.c
index 82a227d97..7bf1d90db 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_ops.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_ops.c
@@ -21,6 +21,8 @@
 
 #include <debug.h>
 
+const char *af_alg_plugin_name = "af-alg";
+
 typedef struct private_af_alg_ops_t private_af_alg_ops_t;
 
 /**
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_ops.h b/src/libstrongswan/plugins/af_alg/af_alg_ops.h
index ad164029f..b7d642c00 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_ops.h
+++ b/src/libstrongswan/plugins/af_alg/af_alg_ops.h
@@ -33,6 +33,8 @@
 #define SOL_ALG 279
 #endif /* SOL_ALG */
 
+extern const char *af_alg_plugin_name;
+
 typedef struct af_alg_ops_t af_alg_ops_t;
 
 /**
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_prf.c b/src/libstrongswan/plugins/af_alg/af_alg_prf.c
index e6bb9354c..575906bae 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_prf.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_prf.c
@@ -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",
+			lib->crypto->add_prf(lib->crypto, algs[i].id, af_alg_plugin_name,
 							(prf_constructor_t)af_alg_prf_create);
 		}
 	}
diff --git a/src/libstrongswan/plugins/af_alg/af_alg_signer.c b/src/libstrongswan/plugins/af_alg/af_alg_signer.c
index 245675a58..3d6f907bf 100644
--- a/src/libstrongswan/plugins/af_alg/af_alg_signer.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_signer.c
@@ -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",
+			lib->crypto->add_signer(lib->crypto, algs[i].id, af_alg_plugin_name,
 							(signer_constructor_t)af_alg_signer_create);
 		}
 	}
diff --git a/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c b/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
index c67f81089..3cce6ad91 100644
--- a/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
+++ b/src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c
@@ -18,7 +18,7 @@
 #include <library.h>
 #include "fips_prf.h"
 
-static const char *plugin_name = "fips_prf";
+static const char *plugin_name = "fips-prf";
 
 typedef struct private_fips_prf_plugin_t private_fips_prf_plugin_t;