From: Martin Willi <martin@revosec.ch>
Date: Mon, 11 Mar 2013 09:52:13 +0000 (+0100)
Subject: Ignore fourth Qick Mode message sent by Windows servers.
X-Git-Tag: 5.0.3rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0235914d2fa6896120ca084ef0df241e9ad7798c;p=thirdparty%2Fstrongswan.git

Ignore fourth Qick Mode message sent by Windows servers.

Initial patch by Paul Stewart, fixes #289.
---

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 7a84d1cefa..ac3b8d0dc3 100644
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1163,6 +1163,15 @@ static status_t process_response(private_task_manager_t *this,
 
 	if (message->get_exchange_type(message) != this->initiating.type)
 	{
+		/* Windows server sends a fourth quick mode message having an initial
+		 * contact notify. Ignore this message for compatibility. */
+		if (this->initiating.type == EXCHANGE_TYPE_UNDEFINED &&
+			message->get_exchange_type(message) == QUICK_MODE &&
+			message->get_notify(message, INITIAL_CONTACT))
+		{
+			DBG1(DBG_IKE, "ignoring fourth Quick Mode message");
+			return SUCCESS;
+		}
 		DBG1(DBG_IKE, "received %N response, but expected %N",
 			 exchange_type_names, message->get_exchange_type(message),
 			 exchange_type_names, this->initiating.type);