summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-08-18 21:18:10 +0200
committerErmal <eri@pfsense.org>2014-08-18 21:18:10 +0200
commitc650b2f74932b2e7042c2d0c4e47a254918463bc (patch)
treec33f579c12c61230841a7d78191d5ddb47d3efae /usr
parentc28da0a7db8ea00649a7fb0151555ab4e50b6efa (diff)
downloadpfsense-c650b2f74932b2e7042c2d0c4e47a254918463bc.zip
pfsense-c650b2f74932b2e7042c2d0c4e47a254918463bc.tar.gz
Allow HASH algorithms to be empty for phase2 in case the encryption one is AES-GCM
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/vpn_ipsec_phase2.php19
1 files changed, 16 insertions, 3 deletions
diff --git a/usr/local/www/vpn_ipsec_phase2.php b/usr/local/www/vpn_ipsec_phase2.php
index 8a78065..370416e 100644
--- a/usr/local/www/vpn_ipsec_phase2.php
+++ b/usr/local/www/vpn_ipsec_phase2.php
@@ -127,8 +127,8 @@ if ($_POST) {
$input_errors[] = gettext("A valid ikeid must be specified.");
/* input validation */
- $reqdfields = explode(" ", "localid_type halgos uniqid");
- $reqdfieldsn = array(gettext("Local network type"),gettext("P2 Hash Algorithms"), gettext("Unique Identifier"));
+ $reqdfields = explode(" ", "localid_type uniqid");
+ $reqdfieldsn = array(gettext("Local network type"), gettext("Unique Identifier"));
if (!isset($pconfig['mobile'])){
$reqdfields[] = "remoteid_type";
$reqdfieldsn[] = gettext("Remote network type");
@@ -254,7 +254,17 @@ if ($_POST) {
if (!count($ealgos)) {
$input_errors[] = gettext("At least one encryption algorithm must be selected.");
+ } else {
+ if (empty($pconfig['halgo'])) {
+ foreach ($ealgos as $ealgo) {
+ if (!strpos($ealgo['name'], "gcm")) {
+ $input_errors[] = gettext("At least one hashing algorithm needs to be selected.");
+ break;
+ }
+ }
+ }
}
+
}
if (($_POST['lifetime'] && !is_numeric($_POST['lifetime']))) {
$input_errors[] = gettext("The P2 lifetime must be an integer.");
@@ -277,7 +287,10 @@ if ($_POST) {
$ph2ent['protocol'] = $pconfig['proto'];
$ph2ent['encryption-algorithm-option'] = $ealgos;
- $ph2ent['hash-algorithm-option'] = $pconfig['halgos'];
+ if (!empty($pconfig['halgos']))
+ $ph2ent['hash-algorithm-option'] = $pconfig['halgos'];
+ else
+ unset($ph2ent['hash-algorithm-option']);
$ph2ent['pfsgroup'] = $pconfig['pfsgroup'];
$ph2ent['lifetime'] = $pconfig['lifetime'];
$ph2ent['pinghost'] = $pconfig['pinghost'];
OpenPOWER on IntegriCloud