diff options
| author | Martin Willi <martin@strongswan.org> | 2008-06-18 13:32:23 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-06-18 13:32:23 +0000 |
| commit | cc7d8dca38cd5e571fa6a9ee48159255eec433c4 (patch) | |
| tree | b623b848ee7405cd2025bb7996672a075e444807 /src | |
| parent | fdacb2f181fb1c77417d0e4f17ce657c9a267d5f (diff) | |
| download | strongswan-cc7d8dca38cd5e571fa6a9ee48159255eec433c4.tar.bz2 strongswan-cc7d8dca38cd5e571fa6a9ee48159255eec433c4.tar.xz | |
fixed UCI default proposals
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon/plugins/uci/uci_config.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/charon/plugins/uci/uci_config.c b/src/charon/plugins/uci/uci_config.c index 0ba94cdcf..cc44eaa9b 100644 --- a/src/charon/plugins/uci/uci_config.c +++ b/src/charon/plugins/uci/uci_config.c @@ -67,8 +67,17 @@ static proposal_t *create_proposal(char *string, protocol_id_t proto) proposal = proposal_create_from_string(proto, string); } if (!proposal) - { - proposal = proposal_create_default(proto); + { /* UCI default is aes/sha1 only */ + if (proto == PROTO_IKE) + { + proposal = proposal_create_from_string(proto, + "aes128-aes192-aes256-sha1-modp1536-modp2048"); + } + else + { + proposal = proposal_create_from_string(proto, + "aes128-aes192-aes256-sha1"); + } } return proposal; } @@ -187,7 +196,7 @@ static bool peer_enumerator_enumerate(peer_enumerator_t *this, peer_cfg_t **cfg) child_cfg = child_cfg_create(name, create_rekey(esp_rekey) + 300, create_rekey(ike_rekey), 300, NULL, TRUE, MODE_TUNNEL, ACTION_NONE, ACTION_NONE, FALSE); - child_cfg->add_proposal(child_cfg, create_proposal(esp_proposal, PROTO_IKE)); + child_cfg->add_proposal(child_cfg, create_proposal(esp_proposal, PROTO_ESP)); child_cfg->add_traffic_selector(child_cfg, TRUE, create_ts(local_net)); child_cfg->add_traffic_selector(child_cfg, FALSE, create_ts(remote_net)); this->peer_cfg->add_child_cfg(this->peer_cfg, child_cfg); |