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

ikev1: Set protocol ID and SPIs in INITIAL-CONTACT notification payloads

Browse Source 
The payload we sent before is not compliant with RFC 2407 and thus some
peers might abort negotiation (e.g. with an INVALID-PROTOCOL-ID error).

Fixes #819.
This commit is contained in:
Tobias Brunner
2015-03-06 16:50:13 +01:00
parent 6133770db4
commit 9fda0bf007
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/main_mode.c
+13 -2
View File
@@ -213,6 +213,10 @@ static void add_initial_contact(private_main_mode_t *this, message_t *message,
{
identification_t *idr;
host_t *host;
notify_payload_t *notify;
ike_sa_id_t *ike_sa_id;
u_int64_t spi_i, spi_r;
chunk_t spi;
idr = this->ph1->get_id(this->ph1, this->peer_cfg, FALSE);
if (idr && !idr->contains_wildcards(idr))
@@ -224,8 +228,15 @@ static void add_initial_contact(private_main_mode_t *this, message_t *message,
if (!charon->ike_sa_manager->has_contact(charon->ike_sa_manager,
idi, idr, host->get_family(host)))
{
message->add_notify(message, FALSE, INITIAL_CONTACT_IKEV1,
chunk_empty);
notify = notify_payload_create_from_protocol_and_type(
PLV1_NOTIFY, PROTO_IKE, INITIAL_CONTACT_IKEV1);
ike_sa_id = this->ike_sa->get_id(this->ike_sa);
spi_i = ike_sa_id->get_initiator_spi(ike_sa_id);
spi_r = ike_sa_id->get_responder_spi(ike_sa_id);
spi = chunk_cata("cc", chunk_from_thing(spi_i),
chunk_from_thing(spi_r));
notify->set_spi_data(notify, spi);
message->add_payload(message, (payload_t*)notify);
}
}
}