From 5c3b07504d137769c4a3e45be47015fcbfab5b49 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 29 Aug 2016 09:25:03 +0200
Subject: [PATCH] ipsec: "pre shared key" display on main page annoys me

---
 src/etc/inc/ipsec.inc        | 11 ++++++++++-
 src/www/vpn_ipsec.php        |  2 +-
 src/www/vpn_ipsec_phase1.php |  8 --------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc
index cad010506..feb1d10f7 100644
--- a/src/etc/inc/ipsec.inc
+++ b/src/etc/inc/ipsec.inc
@@ -29,7 +29,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* IPsec defines */
 $ipsec_loglevels = array("dmn" => "Daemon", "mgr" => "SA Manager", "ike" => "IKE SA", "chd" => "IKE Child SA",
     "job" => "Job Processing", "cfg" => "Configuration backend", "knl" => "Kernel Interface",
     "net" => "Networking", "asn" => "ASN encoding", "enc" => "Message encoding",
@@ -45,6 +44,16 @@ $p1_ealgos = array(
     'des' => array( 'name' => 'DES' )
 );
 
+$p1_authentication_methods = array(
+    'hybrid_rsa_server' => array( 'name' => 'Hybrid RSA + Xauth', 'mobile' => true ),
+    'xauth_rsa_server' => array( 'name' => 'Mutual RSA + Xauth', 'mobile' => true ),
+    'xauth_psk_server' => array( 'name' => 'Mutual PSK + Xauth', 'mobile' => true ),
+    'eap-tls' => array( 'name' => 'EAP-TLS', 'mobile' => true),
+    'eap-mschapv2' => array( 'name' => 'EAP-MSCHAPV2', 'mobile' => true),
+    'rsasig' => array( 'name' => 'Mutual RSA', 'mobile' => false ),
+    'pre_shared_key' => array( 'name' => 'Mutual PSK', 'mobile' => false ),
+);
+
 $p2_ealgos = array(
     'aes' => array( 'name' => 'AES', 'keysel' => array( 'lo' => 128, 'hi' => 256, 'step' => 64 ) ),
     'blowfish' => array( 'name' => 'Blowfish', 'keysel' => array( 'lo' => 128, 'hi' => 256, 'step' => 64 ) ),
diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php
index 2a22709df..be081ac99 100644
--- a/src/www/vpn_ipsec.php
+++ b/src/www/vpn_ipsec.php
@@ -428,7 +428,7 @@ $( document ).ready(function() {
                           <?=gettext("DH Group"); ?>&nbsp;<?=$p1_dhgroups[$ph1ent['dhgroup']];?>
                       </td>
                       <td class="hidden-xs">
-                          <?=str_replace('_', ' ', $ph1ent['authentication_method']);?>
+                          <?= html_safe($p1_authentication_methods[$ph1ent['authentication_method']]['name']) ?>
                       </td>
                       <td>
                           <?=$ph1ent['descr'];?>&nbsp;
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index e68a038c7..b81eb5c92 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -651,14 +651,6 @@ include("head.inc");
                     <td>
                       <select name="authentication_method" id="authentication_method" class="formselect">
 <?php
-                      $p1_authentication_methods = array(
-                        'hybrid_rsa_server' => array( 'name' => 'Hybrid RSA + Xauth', 'mobile' => true ),
-                        'xauth_rsa_server' => array( 'name' => 'Mutual RSA + Xauth', 'mobile' => true ),
-                        'xauth_psk_server' => array( 'name' => 'Mutual PSK + Xauth', 'mobile' => true ),
-                        'eap-tls' => array( 'name' => 'EAP-TLS', 'mobile' => true),
-                        'eap-mschapv2' => array( 'name' => 'EAP-MSCHAPV2', 'mobile' => true),
-                        'rsasig' => array( 'name' => 'Mutual RSA', 'mobile' => false ),
-                        'pre_shared_key' => array( 'name' => 'Mutual PSK', 'mobile' => false ) );
                       foreach ($p1_authentication_methods as $method_type => $method_params) :
                           if (empty($pconfig['mobile']) && $method_params['mobile']) {
                               continue;