[ipfire-2.x.git] / src / patches / strongswan-5.2.2-issue-816.patch

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/t
index e9a677a655e4..69118abe78df 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1339,7 +1339,7 @@ METHOD(task_manager_t, process_message, status_t,
        {
            DBG1(DBG_IKE, "received message ID %d, expected %d. Ignored",
                 mid, this->responding.mid);
-           if (msg->get_exchange_type(msg) == IKE_SA_INIT)
+           if (mid != 0 && msg->get_exchange_type(msg) == IKE_SA_INIT)
            {   /* clean up IKE_SA state if IKE_SA_INIT has invalid msg ID */
                return DESTROY_ME;
            }
Commit	Line	Data
dea158f2 MT	1	diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/t
	2	index e9a677a655e4..69118abe78df 100644
	3	--- a/src/libcharon/sa/ikev2/task_manager_v2.c
	4	+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
	5	@@ -1339,7 +1339,7 @@ METHOD(task_manager_t, process_message, status_t,
	6	{
	7	DBG1(DBG_IKE, "received message ID %d, expected %d. Ignored",
	8	mid, this->responding.mid);
	9	- if (msg->get_exchange_type(msg) == IKE_SA_INIT)
	10	+ if (mid != 0 && msg->get_exchange_type(msg) == IKE_SA_INIT)
	11	{ /* clean up IKE_SA state if IKE_SA_INIT has invalid msg ID */
	12	return DESTROY_ME;
	13	}