From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 23 Apr 2015 08:06:49 +0000 (+0200)
Subject: charon-tkm: Drop unneeded nonceg get_id function
X-Git-Tag: 5.3.1rc1~35^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8ca50e6358cf245806ebbf15e83039bd9daf085;p=thirdparty%2Fstrongswan.git

charon-tkm: Drop unneeded nonceg get_id function
---

diff --git a/src/charon-tkm/src/tkm/tkm_nonceg.c b/src/charon-tkm/src/tkm/tkm_nonceg.c
index a073267987..89baab7ce1 100644
--- a/src/charon-tkm/src/tkm/tkm_nonceg.c
+++ b/src/charon-tkm/src/tkm/tkm_nonceg.c
@@ -71,12 +71,6 @@ METHOD(nonce_gen_t, destroy, void,
 	free(this);
 }
 
-METHOD(tkm_nonceg_t, get_id, nc_id_type,
-	private_tkm_nonceg_t *this)
-{
-	return this->context_id;
-}
-
 /*
  * Described in header.
  */
@@ -91,7 +85,6 @@ tkm_nonceg_t *tkm_nonceg_create()
 				.allocate_nonce = _allocate_nonce,
 				.destroy = _destroy,
 			},
-			.get_id = _get_id,
 		},
 		.context_id = tkm->idmgr->acquire_id(tkm->idmgr, TKM_CTX_NONCE),
 	);
diff --git a/src/charon-tkm/src/tkm/tkm_nonceg.h b/src/charon-tkm/src/tkm/tkm_nonceg.h
index ceadb081f8..d158551feb 100644
--- a/src/charon-tkm/src/tkm/tkm_nonceg.h
+++ b/src/charon-tkm/src/tkm/tkm_nonceg.h
@@ -36,14 +36,6 @@ struct tkm_nonceg_t {
 	 * Implements nonce_gen_t.
 	 */
 	nonce_gen_t nonce_gen;
-
-	/**
-	 * Get nonce context id.
-	 *
-	 * @return	context id of this nonce generator.
-	 */
-	nc_id_type (*get_id)(tkm_nonceg_t * const this);
-
 };
 
 /**
diff --git a/src/charon-tkm/tests/nonceg_tests.c b/src/charon-tkm/tests/nonceg_tests.c
index 6f524cb224..d150891eb1 100644
--- a/src/charon-tkm/tests/nonceg_tests.c
+++ b/src/charon-tkm/tests/nonceg_tests.c
@@ -27,7 +27,6 @@ START_TEST(test_nonceg_creation)
 
 	ng = tkm_nonceg_create();
 	fail_if(ng == NULL, "Error creating tkm nonce generator");
-	fail_if(ng->get_id(ng) == 0, "Invalid context id (0)");
 
 	ng->nonce_gen.destroy(&ng->nonce_gen);
 }