diff options
| author | Reto Buerki <reet@codelabs.ch> | 2015-04-23 10:06:49 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-05-04 18:07:51 +0200 |
| commit | a8ca50e6358cf245806ebbf15e83039bd9daf085 (patch) | |
| tree | e6d10a9c396cdb50dddb53e517573b98a626b1d5 | |
| parent | 5460098ccee93ad1a80a7593a502642dad2568bd (diff) | |
| download | strongswan-a8ca50e6358cf245806ebbf15e83039bd9daf085.tar.bz2 strongswan-a8ca50e6358cf245806ebbf15e83039bd9daf085.tar.xz | |
charon-tkm: Drop unneeded nonceg get_id function
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm_nonceg.c | 7 | ||||
| -rw-r--r-- | src/charon-tkm/src/tkm/tkm_nonceg.h | 8 | ||||
| -rw-r--r-- | src/charon-tkm/tests/nonceg_tests.c | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/src/charon-tkm/src/tkm/tkm_nonceg.c b/src/charon-tkm/src/tkm/tkm_nonceg.c index a07326798..89baab7ce 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 ceadb081f..d158551fe 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 6f524cb22..d150891eb 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); } |