From: Sansar Choinyambuu <schoinya@hsr.ch>
Date: Fri, 23 Sep 2011 14:04:37 +0000 (+0200)
Subject: Fixed bug for updating supported diffie hellman groups
X-Git-Tag: 4.6.2~363
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f27c30329dd0b46a62bee972b093874bb3664442;p=thirdparty%2Fstrongswan.git

Fixed bug for updating supported diffie hellman groups
---

diff --git a/src/libpts/pts/pts_dh_group.c b/src/libpts/pts/pts_dh_group.c
index f2c7d112de..92f098437d 100644
--- a/src/libpts/pts/pts_dh_group.c
+++ b/src/libpts/pts/pts_dh_group.c
@@ -97,21 +97,21 @@ bool pts_update_supported_dh_groups(char *dh_group, pts_dh_group_t *groups)
 	else if (strcaseeq(dh_group, "ike14"))
 	{
 		/* remove DH Group 19 and 20 */
-		*groups = ~PTS_DH_GROUP_IKE20 | ~PTS_DH_GROUP_IKE19;
+		*groups = ~PTS_DH_GROUP_IKE20 & ~PTS_DH_GROUP_IKE19;
 		return TRUE;
 	}
 	else if (strcaseeq(dh_group, "ike5"))
 	{
 		/* remove DH Group 14, 19 and 20 */
-		*groups = ~PTS_DH_GROUP_IKE20 | ~PTS_DH_GROUP_IKE19
-		| ~PTS_DH_GROUP_IKE14;
+		*groups = ~PTS_DH_GROUP_IKE20 & ~PTS_DH_GROUP_IKE19
+		& ~PTS_DH_GROUP_IKE14;
 		return TRUE;
 	}
 	else if (strcaseeq(dh_group, "ike2"))
 	{
 		/* remove DH Group 5, 14, 19 and 20 */
-		*groups = ~PTS_DH_GROUP_IKE20 | ~PTS_DH_GROUP_IKE19 |
-		~PTS_DH_GROUP_IKE14 | ~PTS_DH_GROUP_IKE5;
+		*groups = ~PTS_DH_GROUP_IKE20 & ~PTS_DH_GROUP_IKE19 &
+		~PTS_DH_GROUP_IKE14 & ~PTS_DH_GROUP_IKE5;
 		return TRUE;
 	}