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

ike: Send AEAD ESP default proposal first

Browse Source 
We generally prefer AEAD nowadays.

References #3461.
This commit is contained in:
Tobias Brunner
2020-06-12 13:47:13 +02:00
parent c7bef954ee
commit 33412158f5
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_tunnel.c
+1 -1
View File
@@ -256,8 +256,8 @@ static void setup_tunnel(private_ha_tunnel_t *this,
child_cfg->add_traffic_selector(child_cfg, FALSE, ts);
ts = traffic_selector_create_dynamic(IPPROTO_ICMP, 0, 65535);
child_cfg->add_traffic_selector(child_cfg, FALSE, ts);
child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
child_cfg->add_proposal(child_cfg, proposal_create_default_aead(PROTO_ESP));
child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
peer_cfg->add_child_cfg(peer_cfg, child_cfg);
this->backend.cfg = peer_cfg;
src/libcharon/plugins/medcli/medcli_config.c
+2 -2
View File
@@ -196,8 +196,8 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
peer_cfg->add_auth_cfg(peer_cfg, auth, FALSE);
child_cfg = child_cfg_create(name, &child);
child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
child_cfg->add_proposal(child_cfg, proposal_create_default_aead(PROTO_ESP));
child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
child_cfg->add_traffic_selector(child_cfg, TRUE, ts_from_string(local_net));
child_cfg->add_traffic_selector(child_cfg, FALSE, ts_from_string(remote_net));
peer_cfg->add_child_cfg(peer_cfg, child_cfg);
@@ -277,8 +277,8 @@ METHOD(enumerator_t, peer_enumerator_enumerate, bool,
this->current->add_auth_cfg(this->current, auth, FALSE);
child_cfg = child_cfg_create(name, &child);
child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
child_cfg->add_proposal(child_cfg, proposal_create_default_aead(PROTO_ESP));
child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
child_cfg->add_traffic_selector(child_cfg, TRUE, ts_from_string(local_net));
child_cfg->add_traffic_selector(child_cfg, FALSE, ts_from_string(remote_net));
this->current->add_child_cfg(this->current, child_cfg);
src/libcharon/plugins/sql/sql_config.c
+1 -1
View File
@@ -153,8 +153,8 @@ static void add_esp_proposals(private_sql_config_t *this,
}
if (use_default)
{
child->add_proposal(child, proposal_create_default(PROTO_ESP));
child->add_proposal(child, proposal_create_default_aead(PROTO_ESP));
child->add_proposal(child, proposal_create_default(PROTO_ESP));
}
}
src/libcharon/plugins/vici/vici_config.c
+2 -2
View File
@@ -2006,12 +2006,12 @@ CALLBACK(children_sn, bool,
}
if (child.proposals->get_count(child.proposals) == 0)
{
proposal = proposal_create_default(PROTO_ESP);
proposal = proposal_create_default_aead(PROTO_ESP);
if (proposal)
{
child.proposals->insert_last(child.proposals, proposal);
}
proposal = proposal_create_default_aead(PROTO_ESP);
proposal = proposal_create_default(PROTO_ESP);
if (proposal)
{
child.proposals->insert_last(child.proposals, proposal);