diff options
author | Martin Willi <martin@strongswan.org> | 2009-12-17 10:50:37 +0100 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2009-12-17 10:52:07 +0100 |
commit | 6ec949e022a4dd36f19676f0ba825c8b7ffcb2f6 (patch) | |
tree | dbada4619c15f17d6874b47d749fdfb83378fe78 /src/charon/sa/tasks/child_create.c | |
parent | f721e0fb5f2cc4aa010a262ab5de228ea48a6357 (diff) | |
download | strongswan-6ec949e02.tar.bz2 strongswan-6ec949e02.tar.xz |
Fixed BEET mode by installing SAs with negotiated address in traffic selector
Diffstat (limited to 'src/charon/sa/tasks/child_create.c')
-rw-r--r-- | src/charon/sa/tasks/child_create.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/charon/sa/tasks/child_create.c b/src/charon/sa/tasks/child_create.c index f6719aa14..1bf73b8d8 100644 --- a/src/charon/sa/tasks/child_create.c +++ b/src/charon/sa/tasks/child_create.c @@ -408,21 +408,21 @@ static status_t select_and_install(private_child_create_t *this, bool no_dh) } status_i = status_o = FAILED; 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) { 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, my_ts, other_ts); 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, my_ts, other_ts); } else { 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, my_ts, other_ts); 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, my_ts, other_ts); } } chunk_clear(&integ_i); |