From f579c0fb422b5db64392d636f1977ee093553698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20LU=C3=87I?= <eri@pfsense.org>
Date: Wed, 14 Jan 2015 12:27:48 +0100
Subject: Add EAP-MSChapv2 implementation for Windows ipsec support as reported
 here https://forum.pfsense.org/index.php?topic=81657.15

---
 usr/local/www/vpn_ipsec_keys.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'usr/local/www/vpn_ipsec_keys.php')

diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index a9bd0f0..ebddcc9 100644
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -52,7 +52,7 @@ $a_secret = &$config['ipsec']['mobilekey'];
 $userkeys = array();
 foreach ($config['system']['user'] as $id => $user) {
 	if (!empty($user['ipsecpsk'])) {
-		$userkeys[] = array('ident' => $user['name'], 'pre-shared-key' => $user['ipsecpsk'], 'id' => $id);;
+		$userkeys[] = array('ident' => $user['name'], 'type' => 'PSK', 'pre-shared-key' => $user['ipsecpsk'], 'id' => $id);;
 	}
 }
 
@@ -110,6 +110,7 @@ if (is_subsystem_dirty('ipsec'))
               <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
                 <tr> 
                   <td class="listhdrr"><?=gettext("Identifier"); ?></td>
+                  <td class="listhdrr"><?=gettext("Type"); ?></td>
                   <td class="listhdr"><?=gettext("Pre-Shared Key"); ?></td>
                   <td class="list">
 			<table border="0" cellspacing="0" cellpadding="1" summary="add key">
@@ -130,6 +131,14 @@ if (is_subsystem_dirty('ipsec'))
 					echo htmlspecialchars($secretent['ident']);
 			?>
 		</td>
+		<td class="listlr gray">
+			<?php
+				if (empty($secretent['type']))
+					echo 'PSK';
+				else
+					echo htmlspecialchars($secretent['type']);
+			?>
+		</td>
 		<td class="listr gray">
 			<?=htmlspecialchars($secretent['pre-shared-key']);?>
 		</td>
@@ -150,6 +159,14 @@ if (is_subsystem_dirty('ipsec'))
                   <td class="listlr">
                     <?=htmlspecialchars($secretent['ident']);?>
                   </td>
+		<td class="listlr">
+			<?php
+				if (empty($secretent['type']))
+					echo 'PSK';
+				else
+					echo htmlspecialchars($secretent['type']);
+			?>
+		</td>
                   <td class="listr">
                     <?=htmlspecialchars($secretent['pre-shared-key']);?>
                   </td>
@@ -158,7 +175,7 @@ if (is_subsystem_dirty('ipsec'))
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr> 
-                  <td class="list" colspan="2"></td>
+                  <td class="list" colspan="3"></td>
                   <td class="list">
 			<table border="0" cellspacing="0" cellpadding="1" summary="add key">
 			    <tr>
-- 
cgit v1.1