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

Add a workaround for ticket #4785:

Browse Source 
There was a regression on strongswan between 5.3.0 and 5.3.2 as reported
at [1]. To workaround this issue, add an extra line on ipsec.secrets
with right fqdn.
This commit is contained in:
Renato Botelho 2015-06-23 09:59:46 -03:00
parent cfc6fd8d04
commit 019ee2bc8c
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etc/inc/vpn.inc
View File

@ -635,12 +635,25 @@ EOD;
continue;
}
if ($myid_type == 'fqdn' && !empty($myid)) {
$myid = "@{$myid}";
}
$peerid = ($peerid_data != 'allusers') ? trim($peerid_data) : '';
if ($peerid_type == 'fqdn' && !empty($peerid)) {
$peerid = "@{$peerid}";
}
if (!empty($ph1ent['pre-shared-key'])) {
if ($myid_type == 'fqdn' && !empty($myid)) {
$pskconf .= "@{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
} else {
$pskconf .= "{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
$pskconf .= "{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
/*
* XXX: Remove after following strongswan issue is fixed:
*https://wiki.strongswan.org/issues/1004
*/
if ($peerid_type == 'address' && is_fqdn($ph1ent['remote-gateway'])) {
$pskconf .= "{$myid} @{$ph1ent['remote-gateway']} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
}
}
}