diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-02-11 01:27:32 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-02-11 01:27:32 -0600 |
| commit | f15f4c17f23128dbf188d57d92c26754edd7187d (patch) | |
| tree | e5cd831f874cd9b086ebdd042f527ce96bb5e248 /src | |
| parent | b24a0251719ca9982f766a2f8c52120f525b0596 (diff) | |
| download | pfsense-f15f4c17f23128dbf188d57d92c26754edd7187d.zip pfsense-f15f4c17f23128dbf188d57d92c26754edd7187d.tar.gz | |
Fix IKE version "auto". Ticket #5880
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/vpn.inc | 3 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_ipsec.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_ipsec_phase1.php | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index c7d6662..8c9e4b5 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -875,7 +875,8 @@ EOD; if (!empty($ph1ent['iketype'])) { if ($ph1ent['iketype'] == "ikev2") { $keyexchange = "ikev2"; - //$passive = "start"; + } elseif ($ph1ent['iketype'] == "auto") { + $keyexchange = "ike"; } } diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index bc1167f..ad61821 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -311,8 +311,10 @@ display_top_tabs($tab_array); <?php if (empty($ph1ent['iketype']) || $ph1ent['iketype'] == "ikev1") { echo "V1"; - } else { + } elseif ($ph1ent['iketype'] == "ikev2") { echo "V2"; + } elseif ($ph1ent['iketype'] == "auto") { + echo "Auto"; } ?> </td> diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index 05f0af9..16d6375 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -404,8 +404,8 @@ if ($_POST) { } } - if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2") { - $input_errors[] = gettext("Valid arguments for IKE type is v1 or v2"); + if (!empty($pconfig['iketype']) && $pconfig['iketype'] != "ikev1" && $pconfig['iketype'] != "ikev2" && $pconfig['iketype'] != "auto") { + $input_errors[] = gettext("Valid arguments for IKE type is v1, v2 or auto"); } if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) { |
