lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: add fallback chain for openssl

Browse Source
This commit is contained in:
Franco Fichtner 2015-02-23 06:17:08 +01:00
parent d247841ac4
commit 78dfd81e27
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/etc/inc/system.inc
View File

@ -803,11 +803,25 @@ EOD;
return $retval;
}
function system_webgui_start() {
function system_webgui_start()
{
global $config, $g;
if ($g['booting'])
if (file_exists('/usr/local/bin/openssl')) {
/* use the ports version */
$bin_openssl = '/usr/local/bin/openssl';
} elseif (file_exists('/usr/bin/openssl')) {
/* use the base version (legacy fallback) */
$bin_openssl = '/usr/bin/openssl';
} else {
/* the infamous "this should never happen" */
log_error(_('Could not find an OpenSSL implementation on your system.'));
}
if ($g['booting']) {
/* XXX no no no no no no no no */
echo gettext("Starting webConfigurator...");
}
chdir('/usr/local/www');
@ -841,7 +855,7 @@ function system_webgui_start() {
$openssl_args .= ' -subj "/C=NL/ST=Zuid-Holland/L=Middelharnis/O=OPNsense"';
$openssl_args .= ' -keyout /tmp/ssl.key';
$openssl_args .= ' -out /tmp/ssl.crt';
mwexec('/usr/bin/openssl' . $openssl_args);
mwexec($bin_openssl . $openssl_args);
$crt = file_get_contents('/tmp/ssl.crt');
$key = file_get_contents('/tmp/ssl.key');
unlink('/tmp/ssl.key');