diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-10-28 10:17:16 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-10-28 17:06:12 -0200 |
| commit | 44c7d73c4a1aa2cca3a932447ef6b6be2034badd (patch) | |
| tree | 3d117ff2ae241ee53094e8a54e3ff692a9eb8697 | |
| parent | 4721677dd735dcc8de2f961b2fe02d2c3bf74451 (diff) | |
| download | pfsense-44c7d73c4a1aa2cca3a932447ef6b6be2034badd.zip pfsense-44c7d73c4a1aa2cca3a932447ef6b6be2034badd.tar.gz | |
Decode recently created cert and key. It fixes #3964. While here, fix logical condition to create a new cert if crt or key is not present
| -rw-r--r-- | etc/inc/system.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 328e1d7..779c4b9 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -826,10 +826,10 @@ function system_webgui_start() { if ($config['system']['webgui']['protocol'] == "https") { // Ensure that we have a webConfigurator CERT $cert =& lookup_cert($config['system']['webgui']['ssl-certref']); - if(!is_array($cert) && !$cert['crt'] && !$cert['prv']) { + if(!is_array($cert) || !$cert['crt'] || !$cert['prv']) { $cert = system_webgui_create_certificate(); - $crt = $cert['crt']; - $key = $cert['prv']; + $crt = base64_decode($cert['crt']); + $key = base64_decode($cert['prv']); } else { $crt = base64_decode($cert['crt']); $key = base64_decode($cert['prv']); |
