From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 15 Aug 2014 13:59:12 +0000 (+0200)
Subject: ikev1: Skip unusable IPComp proposals
X-Git-Tag: 5.2.1dr1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f7fef569b4aa30ba588b483fc139ca4c27362f6;p=thirdparty%2Fstrongswan.git

ikev1: Skip unusable IPComp proposals

Fixes #661.
---

diff --git a/src/libcharon/encoding/payloads/sa_payload.c b/src/libcharon/encoding/payloads/sa_payload.c
index 59dac216d5..407038a2db 100644
--- a/src/libcharon/encoding/payloads/sa_payload.c
+++ b/src/libcharon/encoding/payloads/sa_payload.c
@@ -369,7 +369,7 @@ METHOD(sa_payload_t, get_ipcomp_proposals, linked_list_t*,
 		}
 		if (proposal_number != current_proposal)
 		{	/* start of a new proposal */
-			if (espah && ipcomp)
+			if (espah && ipcomp && ipcomp->get_cpi(ipcomp, NULL))
 			{	/* previous proposal is valid */
 				break;
 			}