lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generate correct config for "Hybrid-RSA + XAuth" IPSec (#3117)

Browse Source
This commit is contained in:
Max Weller 2019-01-10 15:44:17 +01:00 committed by Ad Schellevis
parent 3616d808d4
commit 8464cfc31e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/etc/inc/plugins.inc.d/ipsec.inc
View File

@ -1239,8 +1239,7 @@ function ipsec_configure_do($verbose = false, $interface = '')
$authentication = "leftauth = pubkey\n\trightauth = pubkey";
break;
case 'hybrid_rsa_server':
$authentication = "leftauth = xauth-generic\n\trightauth = pubkey";
$authentication .= "\n\trightauth2 = xauth";
$authentication = "leftauth = pubkey\n\trightauth = xauth";
break;
}
if (!empty($ph1ent['certref'])) {

6
src/www/vpn_ipsec_phase1.php
View File

@ -201,6 +201,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$reqdfieldsn = array(gettext("Pre-Shared Key"));
break;
case "hybrid_rsa_server":
$reqdfields = explode(' ', 'certref');
$reqdfieldsn = array(gettext("Certificate"));
break;
case "xauth_rsa_server":
case "rsasig":
$reqdfields = explode(" ", "caref certref");
@ -491,6 +494,9 @@ include("head.inc");
}
break;
case 'hybrid_rsa_server':
$('.auth_eap_tls').show();
$('.auth_eap_tls :input').prop('disabled', false);
break;
case 'xauth_rsa_server':
case 'rsasig':
case 'rsa_eap-mschapv2':