From 81fa4ec53df1dfd5319573852817a3bf9b457ce4 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 21 Mar 2021 20:10:45 +0100
Subject: [PATCH] IPSec: prepend keyid: to enforce type on rightid|leftid, ref
 https://forum.opnsense.org/index.php?topic=22197

---
 src/etc/inc/plugins.inc.d/ipsec.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc
index 86abaa91b..828365b0d 100644
--- a/src/etc/inc/plugins.inc.d/ipsec.inc
+++ b/src/etc/inc/plugins.inc.d/ipsec.inc
@@ -811,6 +811,9 @@ function ipsec_find_id(&$ph1ent, $side = 'local')
         case "peeraddress":
             $thisid_data = ipsec_resolve($ph1ent['remote-gateway']);
             break;
+        case "keyid tag":
+            $thisid_data = !empty($id_data) ? "keyid:{$id_data}" : null;
+            break;
         default:
             $thisid_data = !empty($id_data) ? "{$id_data}" : null;
             break;