From: Reto Buerki <reet@codelabs.ch>
Date: Tue, 12 Jun 2012 12:39:33 +0000 (+0200)
Subject: charon-tkm: Register tkm nonce generator
X-Git-Tag: 5.0.3rc1~39^2~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d51305aa3f2ff5949a10612d443f0d88b51a48ee;p=thirdparty%2Fstrongswan.git

charon-tkm: Register tkm nonce generator
---

diff --git a/src/charon-tkm/Makefile.am b/src/charon-tkm/Makefile.am
index 44586dc4a1..94216cadb4 100644
--- a/src/charon-tkm/Makefile.am
+++ b/src/charon-tkm/Makefile.am
@@ -27,7 +27,6 @@ PLUGINS = \
 	gmp \
 	hmac \
 	kernel-netlink \
-	nonce \
 	pem \
 	pkcs1 \
 	pkcs8 \
diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 3e52fa47d3..c9c27ba1c0 100644
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -33,6 +33,7 @@
 #include <threading/thread.h>
 
 #include "tkm.h"
+#include "tkm_nonceg.h"
 
 /**
  * PID file, in which charon-tkm stores its process id
@@ -267,6 +268,14 @@ int main(int argc, char *argv[])
 
 	DBG1(DBG_DMN, "Starting charon with TKM backend (strongSwan "VERSION")");
 
+	/* register TKM specific plugins */
+	static plugin_feature_t features[] = {
+		PLUGIN_REGISTER(NONCE_GEN, tkm_nonceg_create),
+		PLUGIN_PROVIDE(NONCE_GEN)
+	};
+	lib->plugins->add_static_features(lib->plugins, "tkm-backend", features,
+			countof(features), TRUE);
+
 	/* initialize daemon */
 	if (!charon->initialize(charon, PLUGINS))
 	{