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

change key derivation order to fullfill RFC

Browse Source
This commit is contained in:
Martin Willi
2006-06-19 08:11:42 +00:00
parent f7eb60dd5e
commit 891dfaf983
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/child_sa.c
+26 -11
View File
@@ -295,14 +295,12 @@ static status_t install(private_child_sa_t *this, proposal_t *proposal, prf_plus
static status_t add(private_child_sa_t *this, proposal_t *proposal, prf_plus_t *prf_plus) static status_t add(private_child_sa_t *this, proposal_t *proposal, prf_plus_t *prf_plus)
{ {
linked_list_t *list; linked_list_t *list;
u_int32_t outbound_spi, inbound_spi;
/* install others (initiators) SAs*/ /* backup outbound spi, as alloc overwrites it */
if (install(this, proposal, prf_plus, FALSE) != SUCCESS) outbound_spi = proposal->get_spi(proposal);
{
return FAILED;
}
/* get SPIs for our SAs */ /* get SPIs inbound SAs */
list = linked_list_create(); list = linked_list_create();
list->insert_last(list, proposal); list->insert_last(list, proposal);
if (alloc(this, list) != SUCCESS) if (alloc(this, list) != SUCCESS)
@@ -311,25 +309,42 @@ static status_t add(private_child_sa_t *this, proposal_t *proposal, prf_plus_t *
return FAILED; return FAILED;
} }
list->destroy(list); list->destroy(list);
inbound_spi = proposal->get_spi(proposal);
/* install our (responders) SAs */ /* install inbound SAs */
if (install(this, proposal, prf_plus, TRUE) != SUCCESS) if (install(this, proposal, prf_plus, TRUE) != SUCCESS)
{ {
return FAILED; return FAILED;
} }
/* install outbound SAs, restore spi*/
proposal->set_spi(proposal, outbound_spi);
if (install(this, proposal, prf_plus, FALSE) != SUCCESS)
{
return FAILED;
}
proposal->set_spi(proposal, inbound_spi);
return SUCCESS; return SUCCESS;
} }
static status_t update(private_child_sa_t *this, proposal_t *proposal, prf_plus_t *prf_plus) static status_t update(private_child_sa_t *this, proposal_t *proposal, prf_plus_t *prf_plus)
{ {
/* install our (initator) SAs */ u_int32_t inbound_spi;
if (install(this, proposal, prf_plus, TRUE) != SUCCESS)
/* backup received spi, as install() overwrites it */
inbound_spi = proposal->get_spi(proposal);
/* install outbound SAs */
if (install(this, proposal, prf_plus, FALSE) != SUCCESS)
{ {
return FAILED; return FAILED;
} }
/* install his (responder) SAs */
if (install(this, proposal, prf_plus, FALSE) != SUCCESS) /* restore spi */
proposal->set_spi(proposal, inbound_spi);
/* install inbound SAs */
if (install(this, proposal, prf_plus, TRUE) != SUCCESS)
{ {
return FAILED; return FAILED;
} }