From 498b1d91d1bee14d6c486ccf4162dd6993d0416f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 24 Jan 2016 12:16:20 +0100 Subject: [PATCH] openvpn: LibreSSL does not have cryptodev so fix parse; closes #684 --- src/etc/inc/openvpn.inc | 6 ++++++ src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index ca895cb7e..64a2a070d 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -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); diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml index e787b5265..f5bae4f16 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml @@ -332,12 +332,12 @@ - + - - + + - +