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

Added support for IKEv1 IPComp proposals in SA payload.

Browse Source
This commit is contained in:
Tobias Brunner
2012-05-24 15:32:28 +02:00
parent 7a75cae856
commit 647cd741e8
5 changed files with 98 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+2 -2
View File
@@ -235,7 +235,7 @@ METHOD(task_t, build_i, status_t,
this->lifetime += this->peer_cfg->get_over_time(this->peer_cfg);
proposals = this->ike_cfg->get_proposals(this->ike_cfg);
sa_payload = sa_payload_create_from_proposals_v1(proposals,
this->lifetime, 0, this->method, MODE_NONE, FALSE);
this->lifetime, 0, this->method, MODE_NONE, FALSE, 0);
proposals->destroy_offset(proposals, offsetof(proposal_t, destroy));
message->add_payload(message, &sa_payload->payload_interface);
@@ -480,7 +480,7 @@ METHOD(task_t, build_r, status_t,
identification_t *id;
sa_payload = sa_payload_create_from_proposal_v1(this->proposal,
this->lifetime, 0, this->method, MODE_NONE, FALSE);
this->lifetime, 0, this->method, MODE_NONE, FALSE, 0);
message->add_payload(message, &sa_payload->payload_interface);
if (!this->ph1->add_nonce_ke(this->ph1, message))
src/libcharon/sa/ikev1/tasks/main_mode.c
+2 -2
View File
@@ -241,7 +241,7 @@ METHOD(task_t, build_i, status_t,
this->lifetime += this->peer_cfg->get_over_time(this->peer_cfg);
proposals = this->ike_cfg->get_proposals(this->ike_cfg);
sa_payload = sa_payload_create_from_proposals_v1(proposals,
this->lifetime, 0, this->method, MODE_NONE, FALSE);
this->lifetime, 0, this->method, MODE_NONE, FALSE, 0);
proposals->destroy_offset(proposals, offsetof(proposal_t, destroy));
message->add_payload(message, &sa_payload->payload_interface);
@@ -455,7 +455,7 @@ METHOD(task_t, build_r, status_t,
sa_payload_t *sa_payload;
sa_payload = sa_payload_create_from_proposal_v1(this->proposal,
this->lifetime, 0, this->method, MODE_NONE, FALSE);
this->lifetime, 0, this->method, MODE_NONE, FALSE, 0);
message->add_payload(message, &sa_payload->payload_interface);
return NEED_MORE;
src/libcharon/sa/ikev1/tasks/quick_mode.c
+2 -2
View File
@@ -654,7 +654,7 @@ METHOD(task_t, build_i, status_t,
get_lifetimes(this);
sa_payload = sa_payload_create_from_proposals_v1(list,
this->lifetime, this->lifebytes, AUTH_NONE,
this->mode, this->udp);
this->mode, this->udp, 0);
list->destroy_offset(list, offsetof(proposal_t, destroy));
message->add_payload(message, &sa_payload->payload_interface);
@@ -933,7 +933,7 @@ METHOD(task_t, build_r, status_t,
sa_payload = sa_payload_create_from_proposal_v1(this->proposal,
this->lifetime, this->lifebytes, AUTH_NONE,
this->mode, this->udp);
this->mode, this->udp, 0);
message->add_payload(message, &sa_payload->payload_interface);
if (!add_nonce(this, &this->nonce_r, message))