Overhaul IPsec related code. Shared functions have been consolidated into

a new file named /etc/ipsec.inc. Tunnel definitions have been split into
phase1 and phase2. This allows any number of phase2 definitions to be
created for a single phase1 definition. Several facets of configuration
have also been improved. The key size for variable length algorithms can
now be selected and the phase1 ID options have been extended to allow for
more flexible configuration. Several NAT-T related issues have also been
resolved.

Please note, IPsec remote access functionality has been temporarily
disabled. An improved implementation will be included in a follow up
commit.

1 files changed, 635 insertions, 0 deletions

diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
new file mode 100644
index 0000000..0a21362
--- /dev/null
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -0,0 +1,635 @@
+<?php
+/*
+	vpn_ipsec_phase1.php
+	part of m0n0wall (http://m0n0.ch/wall)
+
+	Copyright (C) 2008 Shrew Soft Inc
+	Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+
+if (!is_array($config['ipsec']['phase1']))
+	$config['ipsec']['phase1'] = array();
+
+$a_phase1 = &$config['ipsec']['phase1'];
+
+if($config['interfaces']['lan']) 
+		$specialsrcdst = explode(" ", "lan");
+
+$p1index = $_GET['p1index'];
+if (isset($_POST['p1index']))
+	$p1index = $_POST['p1index'];
+
+if (isset($_GET['dup'])) {
+	$p1index = $_GET['dup'];
+}
+
+if (isset($p1index) && $a_phase1[$p1index])
+{
+	$pconfig['ikeid'] = $a_phase1[$p1index]['ikeid'];
+	$pconfig['disabled'] = isset($a_phase1[$p1index]['disabled']);
+
+	if ($a_phase1[$p1index]['interface'])
+		$pconfig['interface'] = $a_phase1[$p1index]['interface'];
+	else
+		$pconfig['interface'] = "wan";
+
+	list($pconfig['remotenet'],$pconfig['remotebits']) = explode("/", $a_phase1[$p1index]['remote-subnet']);
+	$pconfig['remotegw'] = $a_phase1[$p1index]['remote-gateway'];
+	$pconfig['mode'] = $a_phase1[$p1index]['mode'];
+	$pconfig['myid_type'] = $a_phase1[$p1index]['myid_type'];
+	$pconfig['myid_data'] = $a_phase1[$p1index]['myid_data'];
+	$pconfig['peerid_type'] = $a_phase1[$p1index]['peerid_type'];
+	$pconfig['peerid_data'] = $a_phase1[$p1index]['peerid_data'];
+	$pconfig['ealgo'] = $a_phase1[$p1index]['encryption-algorithm'];
+	$pconfig['halgo'] = $a_phase1[$p1index]['hash-algorithm'];
+	$pconfig['dhgroup'] = $a_phase1[$p1index]['dhgroup'];
+	$pconfig['lifetime'] = $a_phase1[$p1index]['lifetime'];
+	$pconfig['authentication_method'] = $a_phase1[$p1index]['authentication_method'];
+	$pconfig['pskey'] = $a_phase1[$p1index]['pre-shared-key'];
+	$pconfig['cert'] = base64_decode($a_phase1[$p1index]['cert']);
+	$pconfig['peercert'] = base64_decode($a_phase1[$p1index]['peercert']);
+	$pconfig['privatekey'] = base64_decode($a_phase1[$p1index]['private-key']);
+
+	$pconfig['descr'] = $a_phase1[$p1index]['descr'];
+	$pconfig['nat_traversal'] = $a_phase1[$p1index]['nat_traversal'];
+	$pconfig['dpd_enable'] = $a_phase1[$p1index]['dpd_enable'];
+	$pconfig['dpd_delay'] = $a_phase1[$p1index]['dpd_delay'];
+	$pconfig['dpd_maxfail'] = $a_phase1[$p1index]['dpd_maxfail'];
+	$pconfig['pinghost'] = $a_phase1[$p1index]['pinghost'];
+}
+else
+{
+	/* defaults */
+	$pconfig['interface'] = "wan";
+	if($config['interfaces']['lan']) 
+		$pconfig['localnet'] = "lan";
+	$pconfig['mode'] = "aggressive";
+	$pconfig['myid_type'] = "myaddress";
+	$pconfig['peerid_type'] = "peeraddress";
+	$pconfig['authentication_method'] = "pre_shared_key";
+	$pconfig['ealgo'] = array( name => "3des" );
+	$pconfig['halgo'] = "sha1";
+	$pconfig['dhgroup'] = "2";
+	$pconfig['lifetime'] = "28800";
+	$pconfig['nat_traversal'] = "on";
+	$pconfig['dpd_enable'] = 1;
+	$pconfig['dpd_delay'] = 10;
+	$pconfig['dpd_maxfail'] = 5;
+}
+
+if (isset($_GET['dup']))
+	unset($p1index);
+
+if ($_POST) {
+	unset($input_errors);
+	$pconfig = $_POST;
+
+	/* input validation */
+	if ($_POST['authentication_method'] == "pre_shared_key") {
+		$reqdfields = explode(" ", "remotegw pskey");
+		$reqdfieldsn = explode(",", "Remote gateway,Pre-Shared Key");
+	} else	{
+		$reqdfields = explode(" ", "remotegw");
+		$reqdfieldsn = explode(",", "Remote gateway");
+		if (!strstr($_POST['cert'], "BEGIN CERTIFICATE") || !strstr($_POST['cert'], "END CERTIFICATE"))
+			$input_errors[] = "This certificate does not appear to be valid.";
+		if (!strstr($_POST['privatekey'], "BEGIN RSA PRIVATE KEY") || !strstr($_POST['privatekey'], "END RSA PRIVATE KEY"))
+			$input_errors[] = "This key does not appear to be valid.";
+		if ($_POST['peercert']!="" && (!strstr($_POST['peercert'], "BEGIN CERTIFICATE") || !strstr($_POST['peercert'], "END CERTIFICATE")))
+			$input_errors[] = "This peer certificate does not appear to be valid.";
+	}
+
+	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+	if (($_POST['lifetime'] && !is_numeric($_POST['lifetime'])))
+		$input_errors[] = "The P1 lifetime must be an integer.";
+
+	if (($_POST['remotegw'] && !is_ipaddr($_POST['remotegw']) && !is_domain($_POST['remotegw']))) 
+		$input_errors[] = "A valid remote gateway address or host name must be specified.";
+
+	if (($_POST['remotegw'] && is_ipaddr($_POST['remotegw']) && !isset($_POST['disabled']) )) {
+		$t = 0;
+		foreach ($a_phase1 as $ph1tmp) {
+			if ($p1index <> $t) {
+				$tremotegw = $pconfig['remotegw'];
+				if (($ph1tmp['remote-gateway'] == $tremotegw) && !isset($ph1tmp['disabled'])) {
+					$input_errors[] = "The remote gateway \"$tremotegw\" is already used by phase1 \"${ph1tmp['descr']}\".";
+				}
+			}
+			$t++;
+		}
+	}
+
+	/* My identity */
+
+	if ($_POST['myid_type'] == "myaddress")
+		$_POST['myid_data'] = "";
+
+	if ($_POST['myid_type'] == "address" and $_POST['myid_data'] == "")
+		$input_errors[] = gettext("Please enter an address for 'My Identifier'");
+
+	if ($_POST['myid_type'] == "keyid tag" and $_POST['myid_data'] == "")
+		$input_errors[] = gettext("Please enter a keyid tag for 'My Identifier'");
+
+	if ($_POST['myid_type'] == "fqdn" and $_POST['myid_data'] == "")
+		$input_errors[] = gettext("Please enter a fully qualified domain name for 'My Identifier'");
+
+	if ($_POST['myid_type'] == "user_fqdn" and $_POST['myid_data'] == "")
+		$input_errors[] = gettext("Please enter a user and fully qualified domain name for 'My Identifier'");
+
+	if ($_POST['myid_type'] == "dyn_dns" and $_POST['myid_data'] == "")
+		$input_errors[] = gettext("Please enter a dynamic domain name for 'My Identifier'");
+
+	if ((($_POST['myid_type'] == "address") && !is_ipaddr($_POST['myid_data'])))
+		$input_errors[] = "A valid IP address for 'My identifier' must be specified.";
+
+	if ((($_POST['myid_type'] == "fqdn") && !is_domain($_POST['myid_data'])))
+		$input_errors[] = "A valid domain name for 'My identifier' must be specified.";
+
+	if ($_POST['myid_type'] == "fqdn")
+		if (is_domain($_POST['myid_data']) == false)
+			$input_errors[] = "A valid FQDN for 'My identifier' must be specified.";
+
+	if ($_POST['myid_type'] == "user_fqdn") {
+		$user_fqdn = explode("@",$_POST['myid_data']);
+		if (is_domain($user_fqdn[1]) == false)
+			$input_errors[] = "A valid User FQDN in the form of user@my.domain.com for 'My identifier' must be specified.";
+	}
+
+	if ($_POST['myid_type'] == "dyn_dns")
+		if (is_domain($_POST['myid_data']) == false)
+			$input_errors[] = "A valid Dynamic DNS address for 'My identifier' must be specified.";
+
+	/* Peer identity */
+
+	if ($_POST['peerid_type'] == "address" and $_POST['peerid_data'] == "")
+		$input_errors[] = gettext("Please enter an address for 'Peer Identifier'");
+
+	if ($_POST['peerid_type'] == "keyid tag" and $_POST['peerid_data'] == "")
+		$input_errors[] = gettext("Please enter a keyid tag for 'Peer Identifier'");
+
+	if ($_POST['peerid_type'] == "fqdn" and $_POST['peerid_data'] == "")
+		$input_errors[] = gettext("Please enter a fully qualified domain name for 'Peer Identifier'");
+
+	if ($_POST['peerid_type'] == "user_fqdn" and $_POST['peerid_data'] == "")
+		$input_errors[] = gettext("Please enter a user and fully qualified domain name for 'Peer Identifier'");
+
+	if ((($_POST['peerid_type'] == "address") && !is_ipaddr($_POST['peerid_data'])))
+		$input_errors[] = "A valid IP address for 'Peer identifier' must be specified.";
+
+	if ((($_POST['peerid_type'] == "fqdn") && !is_domain($_POST['peerid_data'])))
+		$input_errors[] = "A valid domain name for 'Peer identifier' must be specified.";
+
+	if ($_POST['peerid_type'] == "fqdn")
+		if (is_domain($_POST['peerid_data']) == false)
+			$input_errors[] = "A valid FQDN for 'Peer identifier' must be specified.";
+
+	if ($_POST['peerid_type'] == "user_fqdn") {
+		$user_fqdn = explode("@",$_POST['peerid_data']);
+		if (is_domain($user_fqdn[1]) == false)
+			$input_errors[] = "A valid User FQDN in the form of user@my.domain.com for 'Peer identifier' must be specified.";
+	}
+
+	if ($_POST['dpd_enable']) {
+		if (!is_numeric($_POST['dpd_delay']))
+			$input_errors[] = "A numeric value must be specified for DPD delay.";
+
+		if (!is_numeric($_POST['dpd_maxfail']))
+			$input_errors[] = "A numeric value must be specified for DPD retries.";
+	}
+
+	/* build our encryption algorithms array */
+	$pconfig['ealgo'] = array();
+	$pconfig['ealgo']['name'] = $_POST['ealgo'];
+        if($_POST['ealgo_keylen'])
+		$pconfig['ealgo']['keylen'] = $_POST['ealgo_keylen'];
+
+	if (!$input_errors) {
+		$ph1ent['ikeid'] = $_POST['ikeid'];
+		$ph1ent['disabled'] = $_POST['disabled'] ? true : false;
+		$ph1ent['interface'] = $pconfig['interface'];
+		/* if the remote gateway changed and the interface is not WAN then remove route */
+		/* the vpn_ipsec_configure() handles adding the route */
+		if ($_POST['interface'] <> "wan") {
+			if($ph1ent['remote-gateway'] <> $_POST['remotegw']) {
+				mwexec("/sbin/route delete -host {$ph1ent['remote-gateway']}");
+			}
+		}
+		$ph1ent['remote-gateway'] = $_POST['remotegw'];
+		$ph1ent['mode'] = $_POST['mode'];
+
+		$ph1ent['myid_type'] = $_POST['myid_type'];
+		$ph1ent['myid_data'] = $_POST['myid_data'];
+		$ph1ent['peerid_type'] = $_POST['peerid_type'];
+		$ph1ent['peerid_data'] = $_POST['peerid_data'];
+
+		$ph1ent['encryption-algorithm'] = $pconfig['ealgo'];
+		$ph1ent['hash-algorithm'] = $_POST['halgo'];
+		$ph1ent['dhgroup'] = $_POST['dhgroup'];
+		$ph1ent['lifetime'] = $_POST['lifetime'];
+		$ph1ent['pre-shared-key'] = $_POST['pskey'];
+		$ph1ent['private-key'] = base64_encode($_POST['privatekey']);
+		$ph1ent['cert'] = base64_encode($_POST['cert']);
+		$ph1ent['peercert'] = base64_encode($_POST['peercert']);
+		$ph1ent['authentication_method'] = $_POST['authentication_method'];
+
+		$ph1ent['descr'] = $_POST['descr'];
+		$ph1ent['nat_traversal'] = $_POST['nat_traversal'];
+		$ph1ent['dpd_enable'] = $_POST['dpd_enable'];
+		$ph1ent['dpd_delay'] = $_POST['dpd_delay'];
+		$ph1ent['dpd_maxfail'] = $_POST['dpd_maxfail'];
+		$ph1ent['pinghost'] = $_POST['pinghost'];
+
+		/* generate unique phase1 ikeid */
+		if ($ph1ent['ikeid'] == 0) {
+			while (true) {
+				$ph1ent['ikeid']++;
+				foreach ($a_phase1 as $ph1tmp)
+					if( $ph1ent['ikeid'] == $ph1tmp['ikeid'] )
+						break;
+
+				if( $ph1ent['ikeid'] != $ph1tmp['ikeid'] )
+					break;
+			}
+		}
+
+		if (isset($p1index) && $a_phase1[$p1index])
+			$a_phase1[$p1index] = $ph1ent;
+		else
+			$a_phase1[] = $ph1ent;
+
+		write_config();
+		touch($d_ipsecconfdirty_path);
+
+		header("Location: vpn_ipsec.php");
+		exit;
+	}
+}
+
+$pgtitle = array("VPN","IPsec","Edit Phase 1");
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<script language="JavaScript">
+<!--
+function methodsel_change() {
+	switch (document.iform.authentication_method.selectedIndex) {
+		case 1:	/* rsa */
+			document.iform.pskey.disabled = 1;
+			document.iform.privatekey.disabled = 0;
+			document.iform.cert.disabled = 0;
+			document.iform.peercert.disabled = 0;
+			break;
+		default: /* pre-shared */
+			document.iform.pskey.disabled = 0;
+			document.iform.privatekey.disabled = 1;
+			document.iform.cert.disabled = 1;
+			document.iform.peercert.disabled = 1;
+			break;
+	}
+}
+
+/* PHP generated java script for variable length keys */
+function ealgosel_change(bits) {
+	switch (document.iform.ealgo.selectedIndex) {
+<?php
+  $i = 0;
+  foreach ($p1_ealgos as $algo => $algodata) {
+    if (is_array($algodata['keysel'])) {
+      echo "		case {$i}:\n";
+      echo "			document.iform.ealgo_keylen.style.visibility = 'visible';\n";
+      echo "			document.iform.ealgo_keylen.options.length = 0;\n";
+//      echo "			document.iform.ealgo_keylen.options[document.iform.ealgo_keylen.options.length] = new Option( 'auto', 'auto' );\n";
+
+      $key_hi = $algodata['keysel']['hi'];
+      $key_lo = $algodata['keysel']['lo'];
+      $key_step = $algodata['keysel']['step'];
+
+      for ($keylen = $key_hi; $keylen >= $key_lo; $keylen -= $key_step)
+        echo "			document.iform.ealgo_keylen.options[document.iform.ealgo_keylen.options.length] = new Option( '{$keylen} bits', '{$keylen}' );\n";
+      echo "			break;\n";
+    } else {
+      echo "		case {$i}:\n";
+      echo "			document.iform.ealgo_keylen.style.visibility = 'hidden';\n";
+      echo "			document.iform.ealgo_keylen.options.length = 0;\n";
+      echo "			break;\n";
+    }
+    $i++;
+  }
+?>
+	}
+
+	if( bits )
+		document.iform.ealgo_keylen.value = bits;
+}
+function dpdchkbox_change() {
+	if( document.iform.dpd_enable.checked ) {
+			document.iform.dpd_delay.disabled = 0;
+			document.iform.dpd_maxfail.disabled = 0;
+	} else {
+			document.iform.dpd_delay.disabled = 1;
+			document.iform.dpd_maxfail.disabled = 1;
+	}
+}
+//-->
+</script>
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+            <form action="vpn_ipsec_phase1.php" method="post" name="iform" id="iform">
+              <table width="100%" border="0" cellpadding="6" cellspacing="0">
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Disabled</td>
+                  <td width="78%" class="vtable">
+                    <input name="disabled" type="checkbox" id="disabled" value="yes" <?php if ($pconfig['disabled']) echo "checked"; ?>>
+                    <strong>Disable this phase1 entry</strong><br>
+                    <span class="vexpl">Set this option to disable this phase1 without
+                      removing it from the list.
+                    </span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Interface</td>
+                  <td width="78%" class="vtable">
+                    <select name="interface" class="formselect">
+                      <?php 
+                        $interfaces = get_configured_interface_with_descr();
+                        $carpips = find_number_of_needed_carp_interfaces();
+                        for ($i=0; $i<$carpips; $i++) {
+                          $carpip = find_interface_ip("carp" . $i);
+                          $interfaces['carp' . $i] = "CARP{$i} ({$carpip})"; 
+                        }
+                        foreach ($interfaces as $iface => $ifacename):
+                      ?>
+                      <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>>
+                        <?=htmlspecialchars($ifacename);?>
+                      </option>
+                      <?php endforeach; ?>
+                    </select> <br>
+                    <span class="vexpl">Select the interface for the local endpoint of this phase1 entry.</span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Remote gateway</td>
+                  <td width="78%" class="vtable">
+                    <?=$mandfldhtml;?><input name="remotegw" type="text" class="formfld unknown" id="remotegw" size="20" value="<?=$pconfig['remotegw'];?>">
+                    <br>
+                    Enter the public IP address or host name of the remote gateway
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">Description</td>
+                  <td width="78%" class="vtable">
+                    <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
+                    <br> <span class="vexpl">You may enter a description here
+                    for your reference (not parsed).</span>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" class="list" height="12"></td>
+                </tr>
+                <tr>
+                  <td colspan="2" valign="top" class="listtopic">Phase 1 proposal
+                    (Authentication)
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Negotiation mode</td>
+                  <td width="78%" class="vtable">
+                    <select name="mode" class="formselect">
+                      <?php
+                        $modes = explode(" ", "main aggressive");
+                        foreach ($modes as $mode):
+                      ?>
+                      <option value="<?=$mode;?>" <?php if ($mode == $pconfig['mode']) echo "selected"; ?>>
+                        <?=htmlspecialchars($mode);?>
+                      </option>
+                      <?php endforeach; ?>
+                    </select> <br> <span class="vexpl">Aggressive is more flexible, but less secure.</span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">My identifier</td>
+                  <td width="78%" class="vtable">
+                    <select name="myid_type" class="formselect">
+                      <?php foreach ($my_identifier_list as $mode => $modename): ?>
+                        <option value="<?=$mode;?>" <?php if ($mode == $pconfig['myid_type']) echo "selected"; ?>>
+                          <?=htmlspecialchars($modename);?>
+                        </option>
+                      <?php endforeach; ?>
+                    </select>
+                    <input name="myid_data" type="text" class="formfld unknown" id="myid_data" size="30" value="<?=$pconfig['myid_data'];?>">
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Peer identifier</td>
+                  <td width="78%" class="vtable">
+                    <select name="peerid_type" class="formselect">
+                      <?php foreach ($peer_identifier_list as $mode => $modename): ?>
+                      <option value="<?=$mode;?>" <?php if ($mode == $pconfig['peerid_type']) echo "selected"; ?>>
+                        <?=htmlspecialchars($modename);?>
+                      </option>
+                      <?php endforeach; ?>
+                    </select>
+                    <input name="peerid_data" type="text" class="formfld unknown" id="peerid_data" size="30" value="<?=$pconfig['peerid_data'];?>">
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Encryption algorithm</td>
+                  <td width="78%" class="vtable">
+                    <select name="ealgo" class="formselect" onChange="ealgosel_change()">
+                      <?php
+                        foreach ($p1_ealgos as $algo => $algodata):
+                        $selected = '';
+                        if ($algo == $pconfig['ealgo']['name'])
+                          $selected = ' selected';
+                      ?>
+                      <option value="<?=$algo;?>"<?=$selected?>>
+                        <?=htmlspecialchars($algodata['name']);?>
+                      </option>
+                    <?php endforeach; ?>
+                    </select>
+                    <select name="ealgo_keylen" width="30" class="formselect">
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Hash algorithm</td>
+                  <td width="78%" class="vtable">
+                    <select name="halgo" class="formselect">
+                      <?php foreach ($p1_halgos as $algo => $algoname): ?>
+                      <option value="<?=$algo;?>" <?php if ($algo == $pconfig['halgo']) echo "selected"; ?>>
+                        <?=htmlspecialchars($algoname);?>
+                      </option>
+                      <?php endforeach; ?>
+                    </select>
+                    <br>
+                    <span class="vexpl">
+                      Must match the setting chosen on the remote side.
+                    </span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">DH key group</td>
+                  <td width="78%" class="vtable">
+                    <select name="dhgroup" class="formselect">
+                      <?php $keygroups = explode(" ", "1 2 5"); foreach ($keygroups as $keygroup): ?>
+                      <option value="<?=$keygroup;?>" <?php if ($keygroup == $pconfig['dhgroup']) echo "selected"; ?>>
+                        <?=htmlspecialchars($keygroup);?>
+                      </option>
+                      <?php endforeach; ?>
+                    </select>
+                    <br>
+                    <span class="vexpl">
+                      <em>1 = 768 bit, 2 = 1024 bit, 5 = 1536 bit</em>
+                      <br>
+                      Must match the setting chosen on the remote side.
+                    </span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">Lifetime</td>
+                  <td width="78%" class="vtable">
+                    <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="20" value="<?=$pconfig['lifetime'];?>">
+                    seconds
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Authentication method</td>
+                  <td width="78%" class="vtable">
+                    <select name="authentication_method" class="formselect" onChange="methodsel_change()">
+                      <?php foreach ($p1_authentication_methods as $method => $methodname): ?>
+                      <option value="<?=$method;?>" <?php if ($method == $pconfig['authentication_method']) echo "selected"; ?>>
+                        <?=htmlspecialchars($methodname);?>
+                      </option>
+                      <?php endforeach; ?>
+                    </select>
+                    <br>
+                    <span class="vexpl">Must match the setting chosen on the remote side.</span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">Pre-Shared Key</td>
+                  <td width="78%" class="vtable">
+                    <?=$mandfldhtml;?><input name="pskey" type="text" class="formfld unknown" id="pskey" size="40" value="<?=htmlspecialchars($pconfig['pskey']);?>">
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">My Certificate</td>
+                  <td width="78%" class="vtable">
+                    <textarea name="cert" cols="65" rows="7" id="cert" class="formpre"><?=htmlspecialchars($pconfig['cert']);?></textarea>
+                    <br>
+                    Paste a certificate in X.509 PEM format here.</td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncellreq">My Private Key</td>
+                  <td width="78%" class="vtable">
+                    <textarea name="privatekey" cols="65" rows="7" id="privatekey" class="formpre"><?=htmlspecialchars($pconfig['privatekey']);?></textarea>
+                    <br>
+                    Paste an RSA private key in PEM format here.
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">Peer certificate</td>
+                  <td width="78%" class="vtable">
+                    <textarea name="peercert" cols="65" rows="7" id="peercert" class="formpre"><?=htmlspecialchars($pconfig['peercert']);?></textarea>
+                    <br>
+                    Paste the peer X.509 certificate in PEM format here.<br>
+                    Leave this blank if you want to use a CA certificate for identity validation.
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" class="list" height="12"></td>
+                </tr>
+                <tr>
+                  <td colspan="2" valign="top" class="listtopic">Advanced Options</td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">NAT Traversal</td>
+                  <td width="78%" class="vtable">
+                    <select name="nat_traversal" class="formselect">
+                      <option value="off" <?php if ($pconfig['nat_traversal'] == "off") echo "selected"; ?>>Disable</option>
+                      <option value="on" <?php if ($pconfig['nat_traversal'] == "on") echo "selected"; ?>>Enable</option>
+                      <option value="force" <?php if ($pconfig['nat_traversal'] == "force") echo "selected"; ?>>Force</option>
+                    </select>
+                    <br/>
+                    <span class="vexpl">
+                      Set this option to enable the use of NAT-T (i.e. the encapsulation of ESP in UDP packets) if needed,
+                      which can help with clients that are behind restrictive firewalls.
+                    </span>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">Dead Peer Detection</td>
+                  <td width="78%" class="vtable">
+                    <input name="dpd_enable" type="checkbox" id="dpd_enable" value="yes" <?php if ($pconfig['dpd_enable']) echo "checked"; ?> onClick="dpdchkbox_change()">
+                    Enable DPD<br>
+                    <br>
+	            <input name="dpd_delay" type="text" class="formfld unknown" id="dpd_delay" size="5" value="<?=$pconfig['dpd_delay'];?>">
+                    seconds<br>
+                    <span class="vexpl">Delay between requesting peer acknowledgement.</span><br>
+                    <br>
+                    <input name="dpd_maxfail" type="text" class="formfld unknown" id="dpd_maxfail" size="5" value="<?=$pconfig['dpd_maxfail'];?>">
+                    retries<br>
+                    <span class="vexpl">Number consecutive failures allowed before disconnect.</span><br>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top" class="vncell">Automatically ping host</td>
+                  <td width="78%" class="vtable">
+                    <input name="pinghost" type="text" class="formfld unknown" id="pinghost" size="20" value="<?=$pconfig['pinghost'];?>">
+                    IP address
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%" valign="top">&nbsp;</td>
+                  <td width="78%">
+                    <input name="Submit" type="submit" class="formbtn" value="Save">
+                    <input name="ikeid" type="hidden" value="<?=$pconfig['ikeid'];?>">
+                    <?php if (isset($p1index) && $a_phase1[$p1index]): ?>
+                    <input name="p1index" type="hidden" value="<?=$p1index;?>">
+                    <?php endif; ?>
+                  </td>
+                </tr>
+              </table>
+</form>
+<script lannguage="JavaScript">
+<!--
+<?php
+	/* determine if we should init the key length */
+	$keyset = '';
+	if (isset($pconfig['ealgo']['keylen']))
+		if (is_numeric($pconfig['ealgo']['keylen']))
+			$keyset = $pconfig['ealgo']['keylen'];
+?>
+methodsel_change();
+ealgosel_change(<?=$keyset;?>);
+dpdchkbox_change();
+//-->
+</script>
+<?php include("fend.inc"); ?>