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

report installation failure of inbound and/or outbound IPsec SA, separately

Browse Source
This commit is contained in:
Andreas Steffen
2009-07-13 15:13:12 +02:00
parent 5c49289e27
commit ecb32c75ce
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/tasks/child_create.c
+11 -8
View File
@@ -254,7 +254,7 @@ static bool allocate_spi(private_child_create_t *this)
*/ */
static status_t select_and_install(private_child_create_t *this, bool no_dh) static status_t select_and_install(private_child_create_t *this, bool no_dh)
{ {
status_t status; status_t status, status_i, status_o;
chunk_t nonce_i, nonce_r; chunk_t nonce_i, nonce_r;
chunk_t encr_i = chunk_empty, encr_r = chunk_empty; chunk_t encr_i = chunk_empty, encr_r = chunk_empty;
chunk_t integ_i = chunk_empty, integ_r = chunk_empty; chunk_t integ_i = chunk_empty, integ_r = chunk_empty;
@@ -406,22 +406,22 @@ static status_t select_and_install(private_child_create_t *this, bool no_dh)
this->my_cpi = this->other_cpi = 0; this->my_cpi = this->other_cpi = 0;
this->ipcomp = IPCOMP_NONE; this->ipcomp = IPCOMP_NONE;
} }
status = FAILED; status_i = status_o = FAILED;
if (this->keymat->derive_child_keys(this->keymat, this->proposal, if (this->keymat->derive_child_keys(this->keymat, this->proposal,
this->dh, nonce_i, nonce_r, &encr_i, &integ_i, &encr_r, &integ_r)) this->dh, nonce_i, nonce_r, &encr_i, &integ_i, &encr_r, &integ_r))
{ {
if (this->initiator) if (this->initiator)
{ {
status = this->child_sa->install(this->child_sa, encr_r, integ_r, status_i = this->child_sa->install(this->child_sa, encr_r, integ_r,
this->my_spi, this->my_cpi, TRUE); this->my_spi, this->my_cpi, TRUE);
status = this->child_sa->install(this->child_sa, encr_i, integ_i, status_o = this->child_sa->install(this->child_sa, encr_i, integ_i,
this->other_spi, this->other_cpi, FALSE); this->other_spi, this->other_cpi, FALSE);
} }
else else
{ {
status = this->child_sa->install(this->child_sa, encr_i, integ_i, status_i = this->child_sa->install(this->child_sa, encr_i, integ_i,
this->my_spi, this->my_cpi, TRUE); this->my_spi, this->my_cpi, TRUE);
status = this->child_sa->install(this->child_sa, encr_r, integ_r, status_o = this->child_sa->install(this->child_sa, encr_r, integ_r,
this->other_spi, this->other_cpi, FALSE); this->other_spi, this->other_cpi, FALSE);
} }
} }
@@ -430,9 +430,12 @@ static status_t select_and_install(private_child_create_t *this, bool no_dh)
chunk_clear(&encr_i); chunk_clear(&encr_i);
chunk_clear(&encr_r); chunk_clear(&encr_r);
if (status != SUCCESS) if (status_i != SUCCESS || status_o != SUCCESS)
{ {
DBG1(DBG_IKE, "unable to install IPsec SA (SAD) in kernel"); DBG1(DBG_IKE, "unable to install %s%s%sIPsec SA (SAD) in kernel",
(status_i != SUCCESS) ? "inbound " : "",
(status_i != SUCCESS && status_o != SUCCESS) ? "and ": "",
(status_o != SUCCESS) ? "outbound " : "");
return FAILED; return FAILED;
} }