Merge tag 'v5.1.0-1' into sid

tag strongSwan 5.1.0-1

1 files changed, 38 insertions, 8 deletions

diff --git a/src/libcharon/plugins/stroke/stroke_plugin.c b/src/libcharon/plugins/stroke/stroke_plugin.c
index 2884db4bf..31df1f99b 100644
--- a/src/libcharon/plugins/stroke/stroke_plugin.c
+++ b/src/libcharon/plugins/stroke/stroke_plugin.c
@@ -42,10 +42,46 @@ METHOD(plugin_t, get_name, char*,
 	return "stroke";
 }
 
+/**
+ * Register stroke plugin features
+ */
+static bool register_stroke(private_stroke_plugin_t *this,
+							plugin_feature_t *feature, bool reg, void *data)
+{
+	if (reg)
+	{
+		this->socket = stroke_socket_create();
+		return this->socket != NULL;
+	}
+	else
+	{
+		DESTROY_IF(this->socket);
+		return TRUE;
+	}
+}
+
+METHOD(plugin_t, get_features, int,
+	private_stroke_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_CALLBACK((plugin_feature_callback_t)register_stroke, NULL),
+			PLUGIN_PROVIDE(CUSTOM, "stroke"),
+				PLUGIN_SDEPEND(PRIVKEY, KEY_RSA),
+				PLUGIN_SDEPEND(PRIVKEY, KEY_ECDSA),
+				PLUGIN_SDEPEND(PRIVKEY, KEY_DSA),
+				PLUGIN_SDEPEND(CERT_DECODE, CERT_ANY),
+				PLUGIN_SDEPEND(CERT_DECODE, CERT_X509),
+				PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_CRL),
+				PLUGIN_SDEPEND(CERT_DECODE, CERT_X509_AC),
+				PLUGIN_SDEPEND(CERT_DECODE, CERT_TRUSTED_PUBKEY),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
 	private_stroke_plugin_t *this)
 {
-	this->socket->destroy(this->socket);
 	free(this);
 }
 
@@ -61,17 +97,11 @@ plugin_t *stroke_plugin_create()
 			.plugin = {
 				.get_name = _get_name,
 				.reload = (void*)return_false,
+				.get_features = _get_features,
 				.destroy = _destroy,
 			},
 		},
-		.socket = stroke_socket_create(),
 	);
 
-	if (this->socket == NULL)
-	{
-		free(this);
-		return NULL;
-	}
 	return &this->public.plugin;
 }
-