diff options
| author | Martin Willi <martin@revosec.ch> | 2012-01-18 17:42:06 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:37 +0100 |
| commit | 3624b09e21b0deab788db0dfea63e2c324d5284c (patch) | |
| tree | 9df9c384c740a3284148ed333571880af9fb864f /src/libcharon/sa/ikev1/tasks/aggressive_mode.c | |
| parent | 6bc6f67b0f661483fdec413d73f80e419438f817 (diff) | |
| download | strongswan-3624b09e21b0deab788db0dfea63e2c324d5284c.tar.bz2 strongswan-3624b09e21b0deab788db0dfea63e2c324d5284c.tar.xz | |
Set selected proposal on IKEv1 SA, don't pass it separately to Phase 1 helper
Diffstat (limited to 'src/libcharon/sa/ikev1/tasks/aggressive_mode.c')
| -rwxr-xr-x | src/libcharon/sa/ikev1/tasks/aggressive_mode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c index b89b71b4c..9621e7099 100755 --- a/src/libcharon/sa/ikev1/tasks/aggressive_mode.c +++ b/src/libcharon/sa/ikev1/tasks/aggressive_mode.c @@ -360,6 +360,7 @@ METHOD(task_t, process_r, status_t, DBG1(DBG_IKE, "no proposal found"); return send_notify(this, NO_PROPOSAL_CHOSEN); } + this->ike_sa->set_proposal(this->ike_sa, this->proposal); this->method = sa_payload->get_auth_method(sa_payload); this->lifetime = sa_payload->get_lifetime(sa_payload); @@ -469,12 +470,11 @@ METHOD(task_t, build_r, status_t, { return send_notify(this, INVALID_KEY_INFORMATION); } - if (!this->ph1->create_hasher(this->ph1, this->proposal)) + if (!this->ph1->create_hasher(this->ph1)) { return send_notify(this, NO_PROPOSAL_CHOSEN); } - if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method, - this->proposal)) + if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method)) { return send_notify(this, INVALID_KEY_INFORMATION); } @@ -528,6 +528,7 @@ METHOD(task_t, process_i, status_t, DBG1(DBG_IKE, "no proposal found"); return send_notify(this, NO_PROPOSAL_CHOSEN); } + this->ike_sa->set_proposal(this->ike_sa, this->proposal); lifetime = sa_payload->get_lifetime(sa_payload); if (lifetime != this->lifetime) @@ -547,12 +548,11 @@ METHOD(task_t, process_i, status_t, { return send_notify(this, INVALID_PAYLOAD_TYPE); } - if (!this->ph1->create_hasher(this->ph1, this->proposal)) + if (!this->ph1->create_hasher(this->ph1)) { return send_notify(this, NO_PROPOSAL_CHOSEN); } - if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method, - this->proposal)) + if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method)) { return send_notify(this, INVALID_KEY_INFORMATION); } |