diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-02 17:03:34 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-02 17:03:34 -0500 |
| commit | c3b70489031f543a83ab17cb7b4def8496c850fb (patch) | |
| tree | 80bdafeab83aa5e58a17ef6fd3c2ad507d89a394 | |
| parent | 367e08b09a9c10b1e475cb00abda5c0ce8147510 (diff) | |
| download | pfsense-c3b70489031f543a83ab17cb7b4def8496c850fb.zip pfsense-c3b70489031f543a83ab17cb7b4def8496c850fb.tar.gz | |
use same variable
| -rw-r--r-- | etc/inc/system.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 2e760d6..abfa7ef 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -633,14 +633,12 @@ function system_webgui_start() { if(file_exists($cert_file && $key_file)) { $cert = array(); $cert['refid'] = uniqid(); - $cert_txt = file_get_contents("/etc/default_ssl_certs/pfSense_webConfigurator_HTTPS_Certificate.crt"); - $key_txt = file_get_contents("/etc/default_ssl_certs/pfSense_webConfigurator_HTTPS_Certificate.key"); - cert_import($cert, $cert_txt, $key_txt); + $crt = file_get_contents("/etc/default_ssl_certs/pfSense_webConfigurator_HTTPS_Certificate.crt"); + $key = file_get_contents("/etc/default_ssl_certs/pfSense_webConfigurator_HTTPS_Certificate.key"); + cert_import($cert, $crt, $key); $a_cert[] = $cert; $config['system']['webgui']['ssl-certref'] = $cert['refid']; write_config("Importing default HTTPS certificate from /etc/default_ssl_certs/"); - $crt = base64_decode($cert['crt']); - $key = base64_decode($cert['prv']); if(!$config['system']['webgui']['port']) $portarg = "443"; $ca = ca_chain($cert); |
