michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-04-13 04:40:20 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make cert type a param

Browse Source
This commit is contained in:
Jamie Cameron
2016-05-25 06:19:42 -07:00
parent 2b212ee3ef
commit 3efec7d052
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webmin/webmin-lib.pl
View File

@@ -2161,19 +2161,22 @@ if (!$found_copy) {
return $temp;
}
# generate_ssl_csr(keyfile, country, state, city, org, orgunit, cname|&cnames, email)
# generate_ssl_csr(keyfile, country, state, city, org, orgunit, cname|&cnames,
# email, ["sha1"|"sha2"])
# Generates a new CSR, and returns either 1 and the temp file path, or 0 and
# an error message
sub generate_ssl_csr
{
my ($ktemp, $country, $state, $city, $org, $orgunit, $cn, $email) = @_;
my ($ktemp, $country, $state, $city, $org, $orgunit, $cn, $email, $ctype) = @_;
$ctype ||= "sha2";
&foreign_require("acl");
my $ctemp = &transname();
my $cmd = &acl::get_ssleay();
my $subject = &build_ssl_subject($country, $state, $city, $org, $orgunit, $cn,$email);
my $conf = &build_ssl_config($cn);
my $ctypeflag = $ctype eq "sha2" ? "-sha256" : "";
my $out = &backquote_command(
"$cmd req -new -key $ktemp -out $ctemp -sha256 ".
"$cmd req -new -key $ktemp -out $ctemp $ctypeflag ".
"-subj ".quotemeta($subject)." -config $conf -reqexts v3_req ".
"-utf8 2>&1");
if (!-r $ctemp || $?) {