From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 3 Nov 2021 09:35:30 +0000 (+0100)
Subject: ike: Fix length of vendor ID Cisco VPN 3000 client
X-Git-Tag: 5.9.5dr2~7
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb19699a7ad18235e2c6fe9de1700afe554e6dde;p=thirdparty%2Fstrongswan.git

ike: Fix length of vendor ID Cisco VPN 3000 client

The actual length of the data is 16 bytes.

Fixes: 6c49ddfbca72 ("ike: Add additional Vendor IDs for third-party implementations")
---

diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
index aa1d65cdcb..733a6136c2 100644
--- a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
@@ -122,7 +122,8 @@ static struct {
 	{ "Cisco VPN Concentrator", 0, FALSE, TRUE, 14,
 	  "\x1f\x07\xf7\x0e\xaa\x65\x14\xd3\xb0\xfa\x96\x54\x2a\x50\x00\x00"},
 
-	{ "Cisco VPN 3000 client", 0, FALSE, FALSE, 20,
+	/* MD5("ALTIGA NETWORKS") */
+	{ "Cisco VPN 3000 client", 0, FALSE, FALSE, 16,
 	  "\xf6\xf7\xef\xc7\xf5\xae\xb8\xcb\x15\x8c\xb9\xd0\x94\xba\x69\xe7"},
 
 	{ "KAME/racoon", 0, FALSE, FALSE, 16,
diff --git a/src/libcharon/sa/ikev2/tasks/ike_vendor.c b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
index 248b68ee45..5ea9df4cf3 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_vendor.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
@@ -118,7 +118,8 @@ static vid_data_t vids[] = {
 	/* Truncated MD5("ALTIGA GATEWAY") plus two version bytes */
 	{ "Cisco VPN Concentrator", 0, NULL, TRUE, 14,
 	  "\x1f\x07\xf7\x0e\xaa\x65\x14\xd3\xb0\xfa\x96\x54\x2a\x50\x00\x00"},
-	{ "Cisco VPN 3000 client", 0, NULL, FALSE, 20,
+	/* MD5("ALTIGA NETWORKS") */
+	{ "Cisco VPN 3000 client", 0, NULL, FALSE, 16,
 	  "\xf6\xf7\xef\xc7\xf5\xae\xb8\xcb\x15\x8c\xb9\xd0\x94\xba\x69\xe7"},
 	{ "ZyXEL ZyWALL Router", 0, NULL, FALSE, 20,
 	  "\xb8\x58\xd1\xad\xdd\x08\xc1\xe8\xad\xaf\xea\x15\x06\x08\xaa\x44\x97\xaa\x6c\xc8"},