diff options
| author | jim-p <jimp@pfsense.org> | 2014-10-15 14:01:00 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-10-15 14:01:00 -0400 |
| commit | 2cf2c62b2748e8644147c7d81167ca6d29eb6783 (patch) | |
| tree | a18d6200d39644b88891e1af3585d589bc5d9c6e /etc | |
| parent | 2f5488df443641574a80b65ede23c1fe75b42f37 (diff) | |
| download | pfsense-2cf2c62b2748e8644147c7d81167ca6d29eb6783.zip pfsense-2cf2c62b2748e8644147c7d81167ca6d29eb6783.tar.gz | |
Fix descriptions and cn on generated GUI cert to be consistent.
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 0bb18e7..e903cdb 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -843,7 +843,7 @@ function system_webgui_create_certificate() { $cert = array(); $cert['refid'] = uniqid(); - $cert['descr'] = gettext("webConfigurator default"); + $cert['descr'] = gettext("webConfigurator default ({$cert['refid']})"); $dn = array( 'countryName' => "US", @@ -851,7 +851,7 @@ function system_webgui_create_certificate() { 'localityName' => "Locality", 'organizationName' => "{$g['product_name']} webConfigurator Self-Signed Certificate", 'emailAddress' => "admin@{$config['system']['hostname']}.{$config['system']['domain']}", - 'commonName' => $config['system']['hostname'] . '-' . uniqid()); + 'commonName' => "{$config['system']['hostname']}-{$cert['refid']}"); $old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */ if (!cert_create($cert, null, 2048, 2000, $dn, "self-signed", "sha256")){ while($ssl_err = openssl_error_string()){ @@ -864,7 +864,7 @@ function system_webgui_create_certificate() { $a_cert[] = $cert; $config['system']['webgui']['ssl-certref'] = $cert['refid']; - write_config(gettext("Importing HTTPS certificate")); + write_config(gettext("Generated new self-signed HTTPS certificate ({$cert['refid']})")); return $cert; } |
