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

ike-cfg: Generalize get_ke_method() method

Browse Source
This commit is contained in:
Tobias Brunner
2022-06-29 10:28:50 +02:00
parent 3bebf5bf8d
commit 093fc1ac63
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/aggressive_mode.c
+3 -2
View File
@@ -252,8 +252,9 @@ METHOD(task_t, build_i, status_t,
message->add_payload(message, &sa_payload->payload_interface);
group = this->ike_cfg->get_ke_method(this->ike_cfg);
if (group == KE_NONE)
group = this->ike_cfg->get_algorithm(this->ike_cfg,
KEY_EXCHANGE_METHOD);
if (!group)
{
DBG1(DBG_IKE, "DH group selection failed");
return FAILED;
src/libcharon/sa/ikev2/tasks/ike_init.c
+4 -2
View File
@@ -674,12 +674,14 @@ METHOD(task_t, build_i, status_t,
}
else
{ /* this shouldn't happen, but let's be safe */
this->dh_group = ike_cfg->get_ke_method(ike_cfg);
this->dh_group = ike_cfg->get_algorithm(ike_cfg,
KEY_EXCHANGE_METHOD);
}
}
else
{
this->dh_group = ike_cfg->get_ke_method(ike_cfg);
this->dh_group = ike_cfg->get_algorithm(ike_cfg,
KEY_EXCHANGE_METHOD);
}
this->dh = this->keymat->keymat.create_ke(&this->keymat->keymat,
this->dh_group);