aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/sa/tasks/quick_mode.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-11-23 14:26:24 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:30:50 +0100
commita7910b1c6e59da37f70bb63c39e9c0615b44eeff (patch)
treec86e8a432e81555a034021bd1a9863c7c5b505de /src/libcharon/sa/tasks/quick_mode.c
parent85f5c478bfa1ae861c36f1c24f4578f13166e91b (diff)
downloadstrongswan-a7910b1c6e59da37f70bb63c39e9c0615b44eeff.tar.bz2
strongswan-a7910b1c6e59da37f70bb63c39e9c0615b44eeff.tar.xz
Derive IKEv1 CHILD_SA keymat twice, once for each IPsec SA
Diffstat (limited to 'src/libcharon/sa/tasks/quick_mode.c')
-rw-r--r--src/libcharon/sa/tasks/quick_mode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcharon/sa/tasks/quick_mode.c b/src/libcharon/sa/tasks/quick_mode.c
index 987b8d5f4..8586d9abf 100644
--- a/src/libcharon/sa/tasks/quick_mode.c
+++ b/src/libcharon/sa/tasks/quick_mode.c
@@ -124,7 +124,8 @@ static bool install(private_quick_mode_t *this)
tsi->insert_last(tsi, this->tsi);
tsr->insert_last(tsr, this->tsr);
if (this->keymat->derive_child_keys(this->keymat, this->proposal, NULL,
- this->nonce_i, this->nonce_r, &encr_i, &integ_i, &encr_r, &integ_r))
+ this->spi_i, this->spi_r, this->nonce_i, this->nonce_r,
+ &encr_i, &integ_i, &encr_r, &integ_r))
{
if (this->initiator)
{