Commit 498b1d91 authored by Franco Fichtner's avatar Franco Fichtner

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

parent 463d9d12
...@@ -187,6 +187,12 @@ function openvpn_get_engines() ...@@ -187,6 +187,12 @@ function openvpn_get_engines()
{ {
$openssl_engines = array('none' => 'No Hardware Crypto Acceleration'); $openssl_engines = array('none' => 'No Hardware Crypto Acceleration');
exec('/usr/local/bin/openssl engine -t -c', $openssl_engine_output); 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 = implode("\n", $openssl_engine_output);
$openssl_engine_output = preg_replace("/\\n\\s+/", "|", $openssl_engine_output); $openssl_engine_output = preg_replace("/\\n\\s+/", "|", $openssl_engine_output);
$openssl_engine_output = explode("\n", $openssl_engine_output); $openssl_engine_output = explode("\n", $openssl_engine_output);
......
...@@ -332,12 +332,12 @@ ...@@ -332,12 +332,12 @@
</LogFile> </LogFile>
</L2TP> </L2TP>
<OpenVPN cssClass="fa fa-lock fa-fw" order="20"> <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"/> <Edit url="/vpn_openvpn_server.php?*" visibility="hidden"/>
</Server> </Servers>
<Client order="20" VisibleName="Client Settings" url="/vpn_openvpn_client.php"> <Clients order="20" url="/vpn_openvpn_client.php">
<Edit url="/vpn_openvpn_client.php?*" visibility="hidden"/> <Edit url="/vpn_openvpn_client.php?*" visibility="hidden"/>
</Client> </Clients>
<CSC order="30" VisibleName="Client Specific Overrides" url="/vpn_openvpn_csc.php"> <CSC order="30" VisibleName="Client Specific Overrides" url="/vpn_openvpn_csc.php">
<Edit url="/vpn_openvpn_csc.php?*" visibility="hidden"/> <Edit url="/vpn_openvpn_csc.php?*" visibility="hidden"/>
</CSC> </CSC>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment