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

ike-rekey: Reset IKE_SA after processing CREATE_CHILD_SA request

Browse Source 
This probably didn't cause any problems, as there wasn't really anything
happening between the calls, but reset it anyway, just to be safe.
This commit is contained in:
Tobias Brunner
2022-06-29 10:28:50 +02:00
parent 36312808d1
commit ba348b4799
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/ike_rekey.c
+7 -5
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015-2016 Tobias Brunner * Copyright (C) 2015-2018 Tobias Brunner
* Copyright (C) 2005-2008 Martin Willi * Copyright (C) 2005-2008 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* *
@@ -167,7 +167,7 @@ METHOD(task_t, build_i, status_t,
ike_version_t version; ike_version_t version;
/* create new SA only on first try */ /* create new SA only on first try */
if (this->new_sa == NULL) if (!this->new_sa)
{ {
version = this->ike_sa->get_version(this->ike_sa); version = this->ike_sa->get_version(this->ike_sa);
this->new_sa = charon->ike_sa_manager->create_new( this->new_sa = charon->ike_sa_manager->create_new(
@@ -254,7 +254,7 @@ METHOD(task_t, process_r, status_t,
this->new_sa->inherit_pre(this->new_sa, this->ike_sa); this->new_sa->inherit_pre(this->new_sa, this->ike_sa);
this->ike_init = ike_init_create(this->new_sa, FALSE, this->ike_sa); this->ike_init = ike_init_create(this->new_sa, FALSE, this->ike_sa);
this->ike_init->task.process(&this->ike_init->task, message); this->ike_init->task.process(&this->ike_init->task, message);
charon->bus->set_sa(charon->bus, this->ike_sa);
return NEED_MORE; return NEED_MORE;
} }
@@ -266,12 +266,14 @@ METHOD(task_t, build_r, status_t,
message->add_notify(message, TRUE, TEMPORARY_FAILURE, chunk_empty); message->add_notify(message, TRUE, TEMPORARY_FAILURE, chunk_empty);
return SUCCESS; return SUCCESS;
} }
if (this->new_sa == NULL) if (!this->new_sa)
{ {
/* IKE_SA/a CHILD_SA is in an unacceptable state, deny rekeying */ /* IKE_SA/a CHILD_SA is in an unacceptable state, deny rekeying */
message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty); message->add_notify(message, TRUE, NO_PROPOSAL_CHOSEN, chunk_empty);
return SUCCESS; return SUCCESS;
} }
charon->bus->set_sa(charon->bus, this->new_sa);
if (this->ike_init->task.build(&this->ike_init->task, message) == FAILED) if (this->ike_init->task.build(&this->ike_init->task, message) == FAILED)
{ {
this->ike_init->task.destroy(&this->ike_init->task); this->ike_init->task.destroy(&this->ike_init->task);
@@ -338,7 +340,7 @@ METHOD(task_t, process_i, status_t,
} }
return SUCCESS; return SUCCESS;
case NEED_MORE: case NEED_MORE:
/* bad dh group, try again */ /* bad KE method, try again */
this->ike_init->task.migrate(&this->ike_init->task, this->new_sa); this->ike_init->task.migrate(&this->ike_init->task, this->new_sa);
return NEED_MORE; return NEED_MORE;
default: default: