ike: Fix prefix length and data of vendor ID Cisco VPN Concentrator

Currently the length of vendor ID Cisco VPN Concentrator is 16
bytes but the string has only 13+1 bytes. The actual vendor
ID has 16 bytes with a prefix length of 14 bytes and two version
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 863a6a4d48b81c5723214d359887d23149bf55a2..aa1d65cdcb289b81a98ca8680cc8b6ced8436cf9 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_vendor.c
@@ -118,8 +118,9 @@ static struct {
        { "MS NT5 ISAKMPOAKLEY", EXT_MS_WINDOWS, FALSE, TRUE, 16,
          "\x1e\x2b\x51\x69\x05\x99\x1c\x7d\x7c\x96\xfc\xbf\xb5\x87\xe4\x61\x00\x00\x00\x00"},
 
-       { "Cisco VPN Concentrator", 0, FALSE, TRUE, 16,
-         "\x1f\x07\xf7\x0e\xaa\x65\x14\xd3\xb0\xfa\x96\x54\x2a"},
+       /* Truncated MD5("ALTIGA GATEWAY") plus two version bytes */
+       { "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,
          "\xf6\xf7\xef\xc7\xf5\xae\xb8\xcb\x15\x8c\xb9\xd0\x94\xba\x69\xe7"},

diff --git a/src/libcharon/sa/ikev2/tasks/ike_vendor.c b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
index 5db1d185b1ec6e09e3b89ef68a56b897e401bac4..248b68ee45e3a004411aff43c6687360de01b7f5 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_vendor.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_vendor.c
@@ -115,8 +115,9 @@ static vid_data_t vids[] = {
          "\xfb\x1d\xe3\xcd\xf3\x41\xb7\xea\x16\xb7\xe5\xbe\x08\x55\xf1\x20"},
        { "Vid-Initial-Contact", 0, NULL, FALSE, 16,
          "\x26\x24\x4d\x38\xed\xdb\x61\xb3\x17\x2a\x36\xe3\xd0\xcf\xb8\x19"},
-       { "Cisco VPN Concentrator", 0, NULL, TRUE, 16,
-         "\x1f\x07\xf7\x0e\xaa\x65\x14\xd3\xb0\xfa\x96\x54\x2a"},
+       /* 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,
          "\xf6\xf7\xef\xc7\xf5\xae\xb8\xcb\x15\x8c\xb9\xd0\x94\xba\x69\xe7"},
        { "ZyXEL ZyWALL Router", 0, NULL, FALSE, 20,