Extend sa_payload for IKEv1 support

This commit is contained in:
Martin Willi
2012-03-20 17:30:40 +01:00
parent 8f3aea2f77
commit b0b9d18593
11 changed files with 160 additions and 37 deletions
+4 -2
View File
@@ -526,11 +526,13 @@ 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(this->proposals);
sa_payload = sa_payload_create_from_proposal_list(SECURITY_ASSOCIATION,
this->proposals);
}
else
{
sa_payload = sa_payload_create_from_proposal(this->proposal);
sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION,
this->proposal);
}
message->add_payload(message, (payload_t*)sa_payload);
+4 -2
View File
@@ -132,7 +132,8 @@ static void build_payloads(private_ike_init_t *this, message_t *message)
enumerator->destroy(enumerator);
}
sa_payload = sa_payload_create_from_proposal_list(proposal_list);
sa_payload = sa_payload_create_from_proposal_list(SECURITY_ASSOCIATION,
proposal_list);
proposal_list->destroy_offset(proposal_list, offsetof(proposal_t, destroy));
}
else
@@ -142,7 +143,8 @@ 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(this->proposal);
sa_payload = sa_payload_create_from_proposal(SECURITY_ASSOCIATION,
this->proposal);
}
message->add_payload(message, (payload_t*)sa_payload);