diff options
| author | jim-p <jimp@pfsense.org> | 2013-01-27 12:20:31 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-01-27 12:20:31 -0500 |
| commit | dae707f5363fa10bae1257492579c57a0c459fdd (patch) | |
| tree | e6973bc5d52fac1e588eb5a58f9c4b345cb8f5a2 /etc | |
| parent | 0674bc42c350d9723db0888b85816326157ddd67 (diff) | |
| download | pfsense-dae707f5363fa10bae1257492579c57a0c459fdd.zip pfsense-dae707f5363fa10bae1257492579c57a0c459fdd.tar.gz | |
Fixup paths when executing OpenSSL.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/crypt.inc | 4 | ||||
| -rw-r--r-- | etc/inc/openvpn.inc | 6 | ||||
| -rw-r--r-- | etc/inc/system.inc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/crypt.inc b/etc/inc/crypt.inc index 8515c84..36b8ea2 100644 --- a/etc/inc/crypt.inc +++ b/etc/inc/crypt.inc @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - pfSense_BUILDER_BINARIES: /usr/bin/openssl + pfSense_BUILDER_BINARIES: /usr/local/bin/openssl pfSense_MODULE: crypto DISABLE_PHP_LINT_CHECKING @@ -35,7 +35,7 @@ function crypt_data($val, $pass, $opt) { $file = tempnam("/tmp", "php-encrypt"); file_put_contents("{$file}.dec", $val); - exec("/usr/bin/openssl enc {$opt} -aes-256-cbc -in {$file}.dec -out {$file}.enc -k " . escapeshellarg($pass)); + exec("/usr/local/bin/openssl enc {$opt} -aes-256-cbc -in {$file}.dec -out {$file}.enc -k " . escapeshellarg($pass)); if (file_exists("{$file}.enc")) $result = file_get_contents("{$file}.enc"); else { diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index b329067..fc7bf1a 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -40,7 +40,7 @@ DISABLE_PHP_LINT_CHECKING - pfSense_BUILDER_BINARIES: /usr/local/sbin/openvpn /usr/bin/openssl /sbin/ifconfig + pfSense_BUILDER_BINARIES: /usr/local/sbin/openvpn /usr/local/bin/openssl /sbin/ifconfig pfSense_MODULE: openvpn */ @@ -102,7 +102,7 @@ function openvpn_create_key() { function openvpn_create_dhparams($bits) { - $fp = popen("/usr/bin/openssl dhparam {$bits} 2>/dev/null", "r"); + $fp = popen("/usr/local/bin/openssl dhparam {$bits} 2>/dev/null", "r"); if (!$fp) return false; @@ -180,7 +180,7 @@ function openvpn_get_cipherlist() { function openvpn_get_engines() { $openssl_engines = array('none' => 'No Hardware Crypto Acceleration'); - exec("/usr/bin/openssl engine", $openssl_engine_output); + exec("/usr/local/bin/openssl engine", $openssl_engine_output); foreach ($openssl_engine_output as $oeo) { $linematch = array(); preg_match("/\((.*)\)\s(.*)/", $oeo, $linematch); diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 5d32cfe..ac10b54 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -766,8 +766,8 @@ function system_webgui_start() { $cert = array(); $cert['refid'] = uniqid(); $cert['descr'] = gettext("webConfigurator default"); - mwexec("/usr/bin/openssl genrsa 1024 > {$g['tmp_path']}/ssl.key"); - mwexec("/usr/bin/openssl req -new -x509 -nodes -sha256 -days 2000 -key {$g['tmp_path']}/ssl.key > {$g['tmp_path']}/ssl.crt"); + mwexec("/usr/local/bin/openssl genrsa 1024 > {$g['tmp_path']}/ssl.key"); + mwexec("/usr/local/bin/openssl req -new -x509 -nodes -sha256 -days 2000 -key {$g['tmp_path']}/ssl.key > {$g['tmp_path']}/ssl.crt"); $crt = file_get_contents("{$g['tmp_path']}/ssl.crt"); $key = file_get_contents("{$g['tmp_path']}/ssl.key"); unlink("{$g['tmp_path']}/ssl.key"); |
