Merge tag 'upstream/4.6.4'

Upstream version 4.6.4

1 files changed, 57 insertions, 17 deletions

diff --git a/src/libcharon/plugins/eap_sim/eap_sim_plugin.c b/src/libcharon/plugins/eap_sim/eap_sim_plugin.c
index b15292544..5bc0af6bd 100644
--- a/src/libcharon/plugins/eap_sim/eap_sim_plugin.c
+++ b/src/libcharon/plugins/eap_sim/eap_sim_plugin.c
@@ -19,20 +19,61 @@
 #include "eap_sim_peer.h"
 
 #include <daemon.h>
+#include <simaka_manager.h>
+
+typedef struct private_eap_sim_plugin_t private_eap_sim_plugin_t;
+
+/**
+ * Private data of an eap_sim_plugin_t object.
+ */
+struct private_eap_sim_plugin_t {
+
+	/**
+	 * Public interface.
+	 */
+	eap_sim_plugin_t public;
+
+	/**
+	 * EAP-SIM backend manager
+	 */
+	simaka_manager_t *mgr;
+};
 
 METHOD(plugin_t, get_name, char*,
-	eap_sim_plugin_t *this)
+	private_eap_sim_plugin_t *this)
 {
 	return "eap-sim";
 }
 
+METHOD(plugin_t, get_features, int,
+	private_eap_sim_plugin_t *this, plugin_feature_t *features[])
+{
+	static plugin_feature_t f[] = {
+		PLUGIN_PROVIDE(CUSTOM, "sim-manager"),
+		PLUGIN_CALLBACK(eap_method_register, eap_sim_server_create),
+			PLUGIN_PROVIDE(EAP_SERVER, EAP_SIM),
+				PLUGIN_DEPENDS(RNG, RNG_WEAK),
+				PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+				PLUGIN_DEPENDS(PRF, PRF_FIPS_SHA1_160),
+				PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA1_128),
+				PLUGIN_DEPENDS(CRYPTER, ENCR_AES_CBC, 16),
+		PLUGIN_CALLBACK(eap_method_register, eap_sim_peer_create),
+			PLUGIN_PROVIDE(EAP_PEER, EAP_SIM),
+				PLUGIN_DEPENDS(RNG, RNG_WEAK),
+				PLUGIN_DEPENDS(HASHER, HASH_SHA1),
+				PLUGIN_DEPENDS(PRF, PRF_FIPS_SHA1_160),
+				PLUGIN_DEPENDS(SIGNER, AUTH_HMAC_SHA1_128),
+				PLUGIN_DEPENDS(CRYPTER, ENCR_AES_CBC, 16),
+	};
+	*features = f;
+	return countof(f);
+}
+
 METHOD(plugin_t, destroy, void,
-	eap_sim_plugin_t *this)
+	private_eap_sim_plugin_t *this)
 {
-	charon->eap->remove_method(charon->eap,
-							   (eap_constructor_t)eap_sim_server_create);
-	charon->eap->remove_method(charon->eap,
-							   (eap_constructor_t)eap_sim_peer_create);
+	lib->set(lib, "sim-manager", NULL);
+	this->mgr->destroy(this->mgr);
 	free(this);
 }
 
@@ -41,21 +82,20 @@ METHOD(plugin_t, destroy, void,
  */
 plugin_t *eap_sim_plugin_create()
 {
-	eap_sim_plugin_t *this;
+	private_eap_sim_plugin_t *this;
 
 	INIT(this,
-		.plugin = {
-			.get_name = _get_name,
-			.reload = (void*)return_false,
-			.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.get_name = _get_name,
+				.get_features = _get_features,
+				.destroy = _destroy,
+			},
 		},
+		.mgr = simaka_manager_create(),
 	);
+	lib->set(lib, "sim-manager", this->mgr);
 
-	charon->eap->add_method(charon->eap, EAP_SIM, 0, EAP_SERVER,
-							(eap_constructor_t)eap_sim_server_create);
-	charon->eap->add_method(charon->eap, EAP_SIM, 0, EAP_PEER,
-							(eap_constructor_t)eap_sim_peer_create);
-
-	return &this->plugin;
+	return &this->public.plugin;
 }