added new Windows Vista VID, courtesy of Jacco de Leeuw

src/pluto/vendor.c

@@ -197,10 +197,11 @@ static struct vid_struct _vid_tab[] = {
 	    "\xeb\x4c\x1b\x78\x8a\xfd\x4a\x9c\xb7\x73\x0a\x68", 12},
 
 	/*
-	 * Windows Vista (and Longhorn?)
+	 * Windows Vista (and Windows Server 2008?)
 	 */
 	DEC_MD5_VID(VISTA_AUTHIP, "MS-Negotiation Discovery Capable")
 	DEC_MD5_VID(VISTA_AUTHIP2, "IKE CGA version 1")
+	DEC_MD5_VID(VISTA_AUTHIP3, "MS-MamieExists")
 
 	/*
 	 * strongSwan

src/pluto/vendor.h

@@ -54,45 +54,46 @@ enum known_vendorid {
   VID_NCP_CLIENT		= 33,
   VID_VISTA_AUTHIP		= 34,
   VID_VISTA_AUTHIP2		= 35,
+  VID_VISTA_AUTHIP3		= 36,
 
-  VID_STRONGSWAN		= 36,
-  VID_STRONGSWAN_2_2_0		= 37,
-  VID_STRONGSWAN_2_2_1		= 38,
-  VID_STRONGSWAN_2_2_2		= 39,
-  VID_STRONGSWAN_2_3_0		= 40,
-  VID_STRONGSWAN_2_3_1		= 41,
-  VID_STRONGSWAN_2_3_2		= 42,
-  VID_STRONGSWAN_2_4_0		= 43,
-  VID_STRONGSWAN_2_4_1		= 44,
-  VID_STRONGSWAN_2_4_2		= 45,
-  VID_STRONGSWAN_2_4_3		= 46,
-  VID_STRONGSWAN_2_4_4		= 47,
-  VID_STRONGSWAN_2_5_0		= 48,
-  VID_STRONGSWAN_2_5_1		= 49,
-  VID_STRONGSWAN_2_5_2		= 50,
-  VID_STRONGSWAN_2_5_3		= 51,
-  VID_STRONGSWAN_2_5_4		= 52,
-  VID_STRONGSWAN_2_5_5		= 53,
-  VID_STRONGSWAN_2_5_6		= 54,
-  VID_STRONGSWAN_2_5_7		= 55,
-  VID_STRONGSWAN_2_6_0		= 56,
-  VID_STRONGSWAN_2_6_1		= 57,
-  VID_STRONGSWAN_2_6_2		= 58,
-  VID_STRONGSWAN_2_6_3		= 59,
-  VID_STRONGSWAN_2_6_4		= 60,
-  VID_STRONGSWAN_2_7_0		= 61,
-  VID_STRONGSWAN_2_7_1		= 62,
-  VID_STRONGSWAN_2_7_2		= 63,
-  VID_STRONGSWAN_2_7_3		= 64,
-  VID_STRONGSWAN_2_8_0		= 65,
-  VID_STRONGSWAN_2_8_1		= 66,
-  VID_STRONGSWAN_2_8_2		= 67,
-  VID_STRONGSWAN_2_8_3		= 68,
-  VID_STRONGSWAN_2_8_4		= 69,
-  VID_STRONGSWAN_2_8_5		= 70,
-  VID_STRONGSWAN_2_8_6		= 71,
-  VID_STRONGSWAN_2_8_7		= 72,
-  VID_STRONGSWAN_2_8_8		= 73,
+  VID_STRONGSWAN		= 37,
+  VID_STRONGSWAN_2_2_0		= 38,
+  VID_STRONGSWAN_2_2_1		= 39,
+  VID_STRONGSWAN_2_2_2		= 40,
+  VID_STRONGSWAN_2_3_0		= 41,
+  VID_STRONGSWAN_2_3_1		= 42,
+  VID_STRONGSWAN_2_3_2		= 43,
+  VID_STRONGSWAN_2_4_0		= 44,
+  VID_STRONGSWAN_2_4_1		= 45,
+  VID_STRONGSWAN_2_4_2		= 46,
+  VID_STRONGSWAN_2_4_3		= 47,
+  VID_STRONGSWAN_2_4_4		= 48,
+  VID_STRONGSWAN_2_5_0		= 49,
+  VID_STRONGSWAN_2_5_1		= 50,
+  VID_STRONGSWAN_2_5_2		= 51,
+  VID_STRONGSWAN_2_5_3		= 52,
+  VID_STRONGSWAN_2_5_4		= 53,
+  VID_STRONGSWAN_2_5_5		= 54,
+  VID_STRONGSWAN_2_5_6		= 55,
+  VID_STRONGSWAN_2_5_7		= 56,
+  VID_STRONGSWAN_2_6_0		= 57,
+  VID_STRONGSWAN_2_6_1		= 58,
+  VID_STRONGSWAN_2_6_2		= 59,
+  VID_STRONGSWAN_2_6_3		= 60,
+  VID_STRONGSWAN_2_6_4		= 61,
+  VID_STRONGSWAN_2_7_0		= 62,
+  VID_STRONGSWAN_2_7_1		= 63,
+  VID_STRONGSWAN_2_7_2		= 64,
+  VID_STRONGSWAN_2_7_3		= 65,
+  VID_STRONGSWAN_2_8_0		= 66,
+  VID_STRONGSWAN_2_8_1		= 67,
+  VID_STRONGSWAN_2_8_2		= 68,
+  VID_STRONGSWAN_2_8_3		= 69,
+  VID_STRONGSWAN_2_8_4		= 70,
+  VID_STRONGSWAN_2_8_5		= 71,
+  VID_STRONGSWAN_2_8_6		= 72,
+  VID_STRONGSWAN_2_8_7		= 73,
+  VID_STRONGSWAN_2_8_8		= 74,
 
   VID_STRONGSWAN_4_0_0		= 80,
   VID_STRONGSWAN_4_0_1		= 81,