From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 31 Aug 2012 09:24:45 +0000 (+0200)
Subject: Add ISA context id getter to TKM keymat
X-Git-Tag: 5.0.3rc1~39^2~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d91acfdb5d25b5993e12f70f05f185458abcd901;p=thirdparty%2Fstrongswan.git

Add ISA context id getter to TKM keymat
---

diff --git a/src/charon-tkm/src/tkm/tkm_keymat.c b/src/charon-tkm/src/tkm/tkm_keymat.c
index d055c38472..bb085b86fa 100644
--- a/src/charon-tkm/src/tkm/tkm_keymat.c
+++ b/src/charon-tkm/src/tkm/tkm_keymat.c
@@ -356,6 +356,12 @@ METHOD(keymat_t, destroy, void,
 	free(this);
 }
 
+METHOD(tkm_keymat_t, get_isa_id, isa_id_type,
+	private_tkm_keymat_t *this)
+{
+	return this->isa_ctx_id;
+}
+
 /**
  * See header.
  */
@@ -377,6 +383,7 @@ tkm_keymat_t *tkm_keymat_create(bool initiator)
 			.get_skd = _get_skd,
 			.get_auth_octets = _get_auth_octets,
 			.get_psk_sig = _get_psk_sig,
+			.get_isa_id = _get_isa_id,
 		},
 		.initiator = initiator,
 		.isa_ctx_id = tkm->idmgr->acquire_id(tkm->idmgr, TKM_CTX_ISA),
diff --git a/src/charon-tkm/src/tkm/tkm_keymat.h b/src/charon-tkm/src/tkm/tkm_keymat.h
index 2def71fb3d..1fb15596a1 100644
--- a/src/charon-tkm/src/tkm/tkm_keymat.h
+++ b/src/charon-tkm/src/tkm/tkm_keymat.h
@@ -106,6 +106,14 @@ struct tkm_keymat_t {
 	bool (*get_psk_sig)(tkm_keymat_t *this, bool verify, chunk_t ike_sa_init,
 						chunk_t nonce, chunk_t secret,
 						identification_t *id, char reserved[3], chunk_t *sig);
+
+	/**
+	 * Get ISA context id.
+	 *
+	 * @return	id of associated ISA context.
+	 */
+	isa_id_type (*get_isa_id)(tkm_keymat_t * const this);
+
 };
 
 /**
diff --git a/src/charon-tkm/tests/keymat_tests.c b/src/charon-tkm/tests/keymat_tests.c
index fbaed24e4b..0fde2fb6e2 100644
--- a/src/charon-tkm/tests/keymat_tests.c
+++ b/src/charon-tkm/tests/keymat_tests.c
@@ -54,6 +54,7 @@ START_TEST(test_derive_ike_keys)
 
 	tkm_keymat_t *keymat = tkm_keymat_create(TRUE);
 	fail_if(!keymat, "Unable to create keymat");
+	fail_if(!keymat->get_isa_id(keymat), "Invalid ISA context id (0)");
 
 	chunk_t nonce;
 	tkm_nonceg_t *ng = tkm_nonceg_create();