diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-10-28 10:17:16 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-10-28 10:17:16 -0200 |
| commit | 143c22f7719836d5decee0da0ec52e61e79fd6a2 (patch) | |
| tree | 0c0b7775dcc7092f683aacaef3896878a51317e6 /etc | |
| parent | 0a8d7fe996275febad7ee28ec3daf70101928cc6 (diff) | |
| download | pfsense-143c22f7719836d5decee0da0ec52e61e79fd6a2.zip pfsense-143c22f7719836d5decee0da0ec52e61e79fd6a2.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
Diffstat (limited to 'etc')
| -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 02f824b..0add04c 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -889,10 +889,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']); |
