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

quick-mode: Make sure we have a proposal before determining lifetimes

Browse Source 
Fixes: e0dd36c9c7 ("ikev1: Get and set the lifetimes of the selected proposal/transform")
This commit is contained in:
Tobias Brunner
2020-03-26 08:41:00 +01:00
parent 6987f6b3eb
commit cb26c5547c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+3 -3
View File
@@ -1147,9 +1147,6 @@ METHOD(task_t, process_r, status_t,
flags); flags);
list->destroy_offset(list, offsetof(proposal_t, destroy)); list->destroy_offset(list, offsetof(proposal_t, destroy));
get_lifetimes(this);
apply_lifetimes(this, sa_payload);
if (!this->proposal) if (!this->proposal)
{ {
DBG1(DBG_IKE, "no matching proposal found, sending %N", DBG1(DBG_IKE, "no matching proposal found, sending %N",
@@ -1158,6 +1155,9 @@ METHOD(task_t, process_r, status_t,
} }
this->spi_i = this->proposal->get_spi(this->proposal); this->spi_i = this->proposal->get_spi(this->proposal);
get_lifetimes(this);
apply_lifetimes(this, sa_payload);
if (!get_nonce(this, &this->nonce_i, message)) if (!get_nonce(this, &this->nonce_i, message))
{ {
return send_notify(this, INVALID_PAYLOAD_TYPE); return send_notify(this, INVALID_PAYLOAD_TYPE);