openvpn: LibreSSL does not have cryptodev so fix parse; closes #684

This commit is contained in:
Franco Fichtner 2016-01-24 12:16:20 +01:00
parent 463d9d12e3
commit 498b1d91d1
2 changed files with 10 additions and 4 deletions

View File

@ -187,6 +187,12 @@ function openvpn_get_engines()
{
$openssl_engines = array('none' => 'No Hardware Crypto Acceleration');
exec('/usr/local/bin/openssl engine -t -c', $openssl_engine_output);
if (!count($openssl_engine_output)) {
/* LibreSSL doesn't offer anything of value */
return $openssl_engines;
}
$openssl_engine_output = implode("\n", $openssl_engine_output);
$openssl_engine_output = preg_replace("/\\n\\s+/", "|", $openssl_engine_output);
$openssl_engine_output = explode("\n", $openssl_engine_output);

View File

@ -332,12 +332,12 @@
</LogFile>
</L2TP>
<OpenVPN cssClass="fa fa-lock fa-fw" order="20">
<Server order="10" VisibleName="Server Settings" url="/vpn_openvpn_server.php">
<Servers order="10" url="/vpn_openvpn_server.php">
<Edit url="/vpn_openvpn_server.php?*" visibility="hidden"/>
</Server>
<Client order="20" VisibleName="Client Settings" url="/vpn_openvpn_client.php">
</Servers>
<Clients order="20" url="/vpn_openvpn_client.php">
<Edit url="/vpn_openvpn_client.php?*" visibility="hidden"/>
</Client>
</Clients>
<CSC order="30" VisibleName="Client Specific Overrides" url="/vpn_openvpn_csc.php">
<Edit url="/vpn_openvpn_csc.php?*" visibility="hidden"/>
</CSC>