From 1dd50732eaddd97dee364e19a7c35cd4d852c6f9 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Apr 2017 09:12:08 +0200
Subject: [PATCH] ipsec: match end of key more carefully #1552

---
 src/www/widgets/widgets/ipsec.widget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/widgets/widgets/ipsec.widget.php b/src/www/widgets/widgets/ipsec.widget.php
index 5828b640e..4a98e13a5 100644
--- a/src/www/widgets/widgets/ipsec.widget.php
+++ b/src/www/widgets/widgets/ipsec.widget.php
@@ -63,7 +63,7 @@ if (isset($config['ipsec']['phase1'])) {
             foreach ($sas_value['child-sas'] as $child_sa_key => $child_sa_value) {
                 if (!isset($ipsec_tunnels[$child_sa_key])) {
                     /* XXX bug on strongSwan 5.5.2 appends -3 and -4 here? */
-                    $child_sa_key = preg_replace('/-.*$/', '', $child_sa_key);
+                    $child_sa_key = preg_replace('/-[^-]+$/', '', $child_sa_key);
                 }
                 if (isset($ipsec_tunnels[$child_sa_key])) {
                     $ipsec_tunnels[$child_sa_key]['active'] = true;