mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove "auto", it's just a synonym for IKEv2. Ticket #4873

Browse Source 
Conflicts:
	usr/local/www/vpn_ipsec_phase1.php
This commit is contained in:
Chris Buechler 2015-07-23 14:43:41 -05:00
parent 0dea741f39
commit 4d7568404c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/vpn.inc
View File

@ -762,9 +762,7 @@ EOD;
if ($ph1ent['iketype'] == "ikev2") {
$keyexchange = "ikev2";
//$passive = "start";
} else if ($ph1ent['iketype'] == "auto") {
$keyexchange = "ike";
}
}
}
if (isset($ph1ent['mobile'])) {

6
usr/local/www/vpn_ipsec_phase1.php
View File

@ -377,8 +377,8 @@ if ($_POST) {
}
}
if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2" && $pconfig['iketype'] != "auto") {
$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2 or auto");
if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2") {
$input_errors[] = gettext("Valid arguments for IKE type is v1 or v2");
}
if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) {
@ -685,7 +685,7 @@ function dpdchkbox_change() {
<td width="78%" class="vtable">
<select name="iketype" class="formselect" onchange='iketype_change()'>
<?php
$keyexchange = array("ikev1" => "V1", "ikev2" => "V2", "auto" => "Auto");
$keyexchange = array("ikev1" => "V1", "ikev2" => "V2");
foreach ($keyexchange as $kidx => $name):
?>
<option value="<?=$kidx;?>" <?php if ($kidx == $pconfig['iketype']) echo "selected=\"selected\""; ?>>