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

ike: Add an additional but separate AEAD proposal to IKE config, if supported

Browse Source
This commit is contained in:
Martin Willi
2014-05-16 16:51:19 +02:00
parent 356846db5d
commit 879e3d12ca
12 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_config.c
+25 -10
View File
@@ -442,17 +442,24 @@ static bool parse_proposal(linked_list_t *list, protocol_id_t proto, chunk_t v)
if (strcaseeq("default", buf))
{
proposal = proposal_create_default(proto);
if (proposal)
{
list->insert_last(list, proposal);
}
proposal = proposal_create_default_aead(proto);
if (proposal)
{
list->insert_last(list, proposal);
}
return TRUE;
}
else
proposal = proposal_create_from_string(proto, buf);
if (proposal)
{
proposal = proposal_create_from_string(proto, buf);
list->insert_last(list, proposal);
return TRUE;
}
if (!proposal)
{
return FALSE;
}
list->insert_last(list, proposal);
return TRUE;
return FALSE;
}
/**
@@ -1755,8 +1762,16 @@ CALLBACK(config_sn, bool,
}
if (peer.proposals->get_count(peer.proposals) == 0)
{
peer.proposals->insert_last(peer.proposals,
proposal_create_default(PROTO_IKE));
proposal = proposal_create_default(PROTO_IKE);
if (proposal)
{
peer.proposals->insert_last(peer.proposals, proposal);
}
proposal = proposal_create_default_aead(PROTO_IKE);
if (proposal)
{
peer.proposals->insert_last(peer.proposals, proposal);
}
}
if (!peer.local_addrs)
{