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

Added not-yet used sa_payload parameters used in IKEv1

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:30:52 +01:00
parent d08269c700
commit e174e0d445
11 changed files with 194 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/authenticators/authenticator.h
+6
View File
@@ -34,6 +34,12 @@ typedef struct authenticator_t authenticator_t;
* Method to use for authentication, as defined in IKEv2.
*/
enum auth_method_t {
/**
* No authentication used.
*/
AUTH_NONE = 0,
/**
* Computed as specified in section 2.15 of RFC using
* an RSA private key over a PKCS#1 padded hash.
src/libcharon/sa/tasks/child_create.c
+2 -4
View File
@@ -527,13 +527,11 @@ static void build_payloads(private_child_create_t *this, message_t *message)
/* add SA payload */
if (this->initiator)
{
sa_payload = sa_payload_create_from_proposal_list(SECURITY_ASSOCIATION,
this->proposals);
sa_payload = sa_payload_create_from_proposals_v2(this->proposals);
}
else
{
sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION,
this->proposal);
sa_payload = sa_payload_create_from_proposal_v2(this->proposal);
}
message->add_payload(message, (payload_t*)sa_payload);
src/libcharon/sa/tasks/ike_init.c
+2 -4
View File
@@ -133,8 +133,7 @@ static void build_payloads(private_ike_init_t *this, message_t *message)
enumerator->destroy(enumerator);
}
sa_payload = sa_payload_create_from_proposal_list(SECURITY_ASSOCIATION,
proposal_list);
sa_payload = sa_payload_create_from_proposals_v2(proposal_list);
proposal_list->destroy_offset(proposal_list, offsetof(proposal_t, destroy));
}
else
@@ -144,8 +143,7 @@ static void build_payloads(private_ike_init_t *this, message_t *message)
/* include SPI of new IKE_SA when we are rekeying */
this->proposal->set_spi(this->proposal, id->get_responder_spi(id));
}
sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION,
this->proposal);
sa_payload = sa_payload_create_from_proposal_v2(this->proposal);
}
message->add_payload(message, (payload_t*)sa_payload);
src/libcharon/sa/tasks/main_mode.c
+4 -4
View File
@@ -299,8 +299,8 @@ METHOD(task_t, build_i, status_t,
proposals = this->ike_cfg->get_proposals(this->ike_cfg);
sa_payload = sa_payload_create_from_proposal_list(
SECURITY_ASSOCIATION_V1, proposals);
sa_payload = sa_payload_create_from_proposals_v1(proposals,
0, 0, AUTH_NONE, MODE_NONE, FALSE);
proposals->destroy_offset(proposals, offsetof(proposal_t, destroy));
message->add_payload(message, &sa_payload->payload_interface);
@@ -573,8 +573,8 @@ METHOD(task_t, build_r, status_t,
{
sa_payload_t *sa_payload;
sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION_V1,
this->proposal);
sa_payload = sa_payload_create_from_proposal_v1(this->proposal,
0, 0, AUTH_NONE, MODE_NONE, FALSE);
message->add_payload(message, &sa_payload->payload_interface);
return NEED_MORE;
src/libcharon/sa/tasks/quick_mode.c
+4 -4
View File
@@ -425,8 +425,8 @@ METHOD(task_t, build_i, status_t,
}
enumerator->destroy(enumerator);
sa_payload = sa_payload_create_from_proposal_list(
SECURITY_ASSOCIATION_V1, list);
sa_payload = sa_payload_create_from_proposals_v1(list,
0, 0, AUTH_NONE, MODE_NONE, FALSE);
list->destroy_offset(list, offsetof(proposal_t, destroy));
message->add_payload(message, &sa_payload->payload_interface);
@@ -551,8 +551,8 @@ METHOD(task_t, build_r, status_t,
}
this->proposal->set_spi(this->proposal, this->spi_r);
sa_payload = sa_payload_create_from_proposal(
SECURITY_ASSOCIATION_V1, this->proposal);
sa_payload = sa_payload_create_from_proposal_v1(this->proposal,
0, 0, AUTH_NONE, MODE_NONE, FALSE);
message->add_payload(message, &sa_payload->payload_interface);
if (!add_nonce(this, &this->nonce_r, message))