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

Set selected proposal on IKEv1 SA, don't pass it separately to Phase 1 helper

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:37 +01:00
parent 6bc6f67b0f
commit 3624b09e21
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+6 -6
View File
@@ -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);
}
src/libcharon/sa/ikev1/tasks/main_mode.c
+6 -6
View File
@@ -262,7 +262,7 @@ METHOD(task_t, build_i, status_t,
{
u_int16_t group;
if (!this->ph1->create_hasher(this->ph1, this->proposal))
if (!this->ph1->create_hasher(this->ph1))
{
return send_notify(this, NO_PROPOSAL_CHOSEN);
}
@@ -353,6 +353,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);
@@ -364,7 +365,7 @@ METHOD(task_t, process_r, status_t,
{
u_int16_t group;
if (!this->ph1->create_hasher(this->ph1, this->proposal))
if (!this->ph1->create_hasher(this->ph1))
{
return send_notify(this, INVALID_KEY_INFORMATION);
}
@@ -454,8 +455,7 @@ METHOD(task_t, build_r, status_t,
{
return send_notify(this, INVALID_KEY_INFORMATION);
}
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);
}
@@ -540,6 +540,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)
@@ -563,8 +564,7 @@ METHOD(task_t, process_i, status_t,
{
return send_notify(this, INVALID_PAYLOAD_TYPE);
}
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);
}