mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2944 from stilez/patch-23

Browse Source
This commit is contained in:
Chris Buechler 2016-06-28 22:36:49 -05:00
commit 31df78a89d
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/certs.inc
View File

@ -56,7 +56,7 @@ define("OPEN_SSL_CONF_PATH", "/etc/ssl/openssl.cnf");
require_once("functions.inc");
global $openssl_digest_algs;
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512");
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512", "whirlpool");
global $openssl_crl_status;
$openssl_crl_status = array(

4
src/usr/local/www/system_camanager.php
View File

@ -69,8 +69,8 @@ $ca_methods = array(
"internal" => gettext("Create an internal Certificate Authority"),
"intermediate" => gettext("Create an intermediate Certificate Authority"));
$ca_keylens = array("512", "1024", "2048", "4096");
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512");
$ca_keylens = array("512", "1024", "2048", "3072", "4096", "7680", "8192", "15360", "16384");
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512", "whirlpool");
if (is_numericint($_GET['id'])) {
$id = $_GET['id'];

4
src/usr/local/www/system_certmanager.php
View File

@ -70,13 +70,13 @@ $cert_methods = array(
"external" => gettext("Create a Certificate Signing Request"),
);
$cert_keylens = array("512", "1024", "2048", "4096");
$cert_keylens = array("512", "1024", "2048", "3072", "4096", "7680", "8192", "15360", "16384");
$cert_types = array(
"server" => "Server Certificate",
"user" => "User Certificate");
$altname_types = array("DNS", "IP", "email", "URI");
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512");
$openssl_digest_algs = array("sha1", "sha224", "sha256", "sha384", "sha512", "whirlpool");
if (is_numericint($_GET['userid'])) {
$userid = $_GET['userid'];

7
src/usr/local/www/system_usermanager.php
View File

@ -841,9 +841,14 @@ if ($act == "new" || $act == "edit" || $input_errors):
512 => '512 bits',
1024 => '1024 bits',
2048 => '2048 bits',
3072 => '3072 bits',
4096 => '4096 bits',
7680 => '7680 bits',
8192 => '8192 bits',
15360 => '15360 bits',
16384 => '16384 bits'
)
));
))->setHelp('The larger the key, the more security it offers, but larger keys take considerably more time to generate, and take slightly longer to validate leading to a slight slowdown in setting up new sessions (not always noticeable). As of 2016, 2048 bit is the minimum and most common selection and 4096 is the maximum in common use. For more information see <a href="https://keylength.com">keylength.com</a>.');
$section->addInput(new Form_Input(
'lifetime',