denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keymat: Acquire AE context ID on initialization

Browse Source
This commit is contained in:
Reto Buerki
2013-03-19 15:23:47 +01:00
committed by Tobias Brunner
parent c755645032
commit cdd4d73ff5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-tkm/src/tkm/tkm_keymat.c
+9 -3
View File
@@ -61,6 +61,11 @@ struct private_tkm_keymat_t {
*/ */
isa_id_type isa_ctx_id; isa_id_type isa_ctx_id;
/**
* AE context id.
*/
ae_id_type ae_ctx_id;
}; };
/** /**
@@ -229,8 +234,8 @@ METHOD(tkm_keymat_t, derive_ike_keys, bool,
DBG1(DBG_IKE, "deriving IKE keys (nc: %llu, dh: %llu, spi_loc: %llx, " DBG1(DBG_IKE, "deriving IKE keys (nc: %llu, dh: %llu, spi_loc: %llx, "
"spi_rem: %llx)", nc_id, dh_id, spi_loc, spi_rem); "spi_rem: %llx)", nc_id, dh_id, spi_loc, spi_rem);
/* Fake some data for now */ /* Fake some data for now */
if (ike_isa_create(this->isa_ctx_id, 1, 1, dh_id, nc_id, nonce_rem, 1, if (ike_isa_create(this->isa_ctx_id, this->ae_ctx_id, 1, dh_id, nc_id,
spi_loc, spi_rem, nonce_rem, 1, spi_loc, spi_rem,
&sk_ai, &sk_ar, &sk_ei, &sk_er) != TKM_OK) &sk_ai, &sk_ar, &sk_ei, &sk_er) != TKM_OK)
{ {
DBG1(DBG_IKE, "key derivation failed"); DBG1(DBG_IKE, "key derivation failed");
@@ -375,10 +380,11 @@ tkm_keymat_t *tkm_keymat_create(bool initiator)
}, },
.initiator = initiator, .initiator = initiator,
.isa_ctx_id = tkm->idmgr->acquire_id(tkm->idmgr, TKM_CTX_ISA), .isa_ctx_id = tkm->idmgr->acquire_id(tkm->idmgr, TKM_CTX_ISA),
.ae_ctx_id = tkm->idmgr->acquire_id(tkm->idmgr, TKM_CTX_AE),
.proxy = keymat_v2_create(initiator), .proxy = keymat_v2_create(initiator),
); );
if (!this->isa_ctx_id) if (!this->isa_ctx_id || !this->ae_ctx_id)
{ {
free(this); free(this);
return NULL; return NULL;