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

Apply IDir before deriving keys as aggressive initiator

Browse Source
This commit is contained in:
Martin Willi
2012-05-23 12:27:47 +02:00
parent 523ce7c20c
commit 3c475660c5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+4 -4
View File
@@ -569,10 +569,6 @@ METHOD(task_t, process_i, status_t,
{ {
return send_notify(this, NO_PROPOSAL_CHOSEN); return send_notify(this, NO_PROPOSAL_CHOSEN);
} }
if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method))
{
return send_notify(this, INVALID_KEY_INFORMATION);
}
id_payload = (id_payload_t*)message->get_payload(message, ID_V1); id_payload = (id_payload_t*)message->get_payload(message, ID_V1);
if (!id_payload) if (!id_payload)
@@ -590,6 +586,10 @@ METHOD(task_t, process_i, status_t,
} }
this->ike_sa->set_other_id(this->ike_sa, id); this->ike_sa->set_other_id(this->ike_sa, id);
if (!this->ph1->derive_keys(this->ph1, this->peer_cfg, this->method))
{
return send_notify(this, INVALID_KEY_INFORMATION);
}
if (!this->ph1->verify_auth(this->ph1, this->method, message, if (!this->ph1->verify_auth(this->ph1, this->method, message,
id_payload->get_encoded(id_payload))) id_payload->get_encoded(id_payload)))
{ {