diff options
| author | jim-p <jimp@pfsense.org> | 2013-01-21 14:30:30 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-01-21 14:33:19 -0500 |
| commit | ca6219025cabd3edbe53e522b345a167381a0171 (patch) | |
| tree | 2e076b0a5f92fbb9393009477528416d1be9690c /usr/local/www/system_certmanager.php | |
| parent | bc2b0144e83bed57262c44175acba00277988101 (diff) | |
| download | pfsense-ca6219025cabd3edbe53e522b345a167381a0171.zip pfsense-ca6219025cabd3edbe53e522b345a167381a0171.tar.gz | |
Allow selecting the digest algorithm when creating a CA or Cert. Implements #2765
Diffstat (limited to 'usr/local/www/system_certmanager.php')
| -rw-r--r-- | usr/local/www/system_certmanager.php | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index c9e9826..d8ca0b6 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -52,6 +52,7 @@ $cert_types = array( "ca" => "Certificate Authority", "user" => "User Certificate"); $altname_types = array("DNS", "IP", "email", "URI"); +global $openssl_digest_algs; $pgtitle = array(gettext("System"), gettext("Certificate Manager")); @@ -292,6 +293,10 @@ if ($_POST) { }else if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) array_push($input_errors, "The field '" . $reqdfieldsn[$i] . "' contains invalid characters."); } + if (!in_array($_POST["keylen"], $cert_keylens)) + array_push($input_errors, gettext("Please select a valid Key Length.")); + if (!in_array($_POST["digest_alg"], $openssl_digest_algs)) + array_push($input_errors, gettext("Please select a valid Digest Algorithm.")); } /* if this is an AJAX caller then handle via JSON */ @@ -336,7 +341,7 @@ if ($_POST) { $dn['subjectAltName'] = implode(",", $altnames_tmp); } if (!cert_create($cert, $pconfig['caref'], $pconfig['keylen'], - $pconfig['lifetime'], $dn, $pconfig['type'])){ + $pconfig['lifetime'], $dn, $pconfig['type'], $pconfig['digest_alg'])){ while($ssl_err = openssl_error_string()){ $input_errors = array(); array_push($input_errors, "openssl library returns: " . $ssl_err); @@ -359,7 +364,7 @@ if ($_POST) { } $dn['subjectAltName'] = implode(",", $altnames_tmp); } - if(!csr_generate($cert, $pconfig['csr_keylen'], $dn)){ + if(!csr_generate($cert, $pconfig['csr_keylen'], $dn, $pconfig['digest_alg'])){ while($ssl_err = openssl_error_string()){ $input_errors = array(); array_push($input_errors, "openssl library returns: " . $ssl_err); @@ -678,6 +683,22 @@ function internalca_change() { </td> </tr> <tr> + <td width="22%" valign="top" class="vncellreq"><?=gettext("Digest Algorithm");?></td> + <td width="78%" class="vtable"> + <select name='digest_alg' id='digest_alg' class="formselect"> + <?php + foreach( $openssl_digest_algs as $digest_alg): + $selected = ""; + if ($pconfig['digest_alg'] == $digest_alg) + $selected = "selected"; + ?> + <option value="<?=$digest_alg;?>"<?=$selected;?>><?=strtoupper($digest_alg);?></option> + <?php endforeach; ?> + </select> + <br/><?= gettext("NOTE: It is recommended to use an algorithm stronger than SHA1 when possible.") ?> + </td> + </tr> + <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate Type");?></td> <td width="78%" class="vtable"> <select name='type' class="formselect"> |
