Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-01-08 01:17:37 +03:00
Code Releases Activity

certificate: fix formatting and whitespace

Browse Source 
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
This commit is contained in:
Max Carrara 2023-03-03 18:57:03 +01:00 committed by Fabian Grünbichler
parent a3baf76738
commit d602284ccb
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/PVE/Certificate.pm
View File

@ -400,19 +400,22 @@ sub generate_csr {
$ssl_die->("Failed to allocate X509_NAME object\n") if !$name; $ssl_die->("Failed to allocate X509_NAME object\n") if !$name;
my $add_name_entry = sub { my $add_name_entry = sub {
my ($k, $v) = @_; my ($k, $v) = @_;
if (!Net::SSLeay::X509_NAME_add_entry_by_txt($name,
$k, my $res = Net::SSLeay::X509_NAME_add_entry_by_txt(
&Net::SSLeay::MBSTRING_UTF8, $name,
encode('utf-8', $v))) { $k,
$cleanup->(1, "Failed to add '$k'='$v' to DN\n"); &Net::SSLeay::MBSTRING_UTF8,
} encode('utf-8', $v),
);
$cleanup->(1, "Failed to add '$k'='$v' to DN\n") if !$res;
}; };
$add_name_entry->('CN', $common_name); $add_name_entry->('CN', $common_name);
for (qw(C ST L O OU)) { for (qw(C ST L O OU)) {
if (defined(my $v = $attr{$_})) { if (defined(my $v = $attr{$_})) {
$add_name_entry->($_, $v); $add_name_entry->($_, $v);
} }
} }
if (defined($pem_key)) { if (defined($pem_key)) {
@ -445,13 +448,13 @@ sub generate_csr {
$cleanup->(1, "Failed to set subject name\n") $cleanup->(1, "Failed to set subject name\n")
if (!Net::SSLeay::X509_REQ_set_subject_name($req, $name)); if (!Net::SSLeay::X509_REQ_set_subject_name($req, $name));
$cleanup->(1, "Failed to add extensions to CSR\n") Net::SSLeay::P_X509_REQ_add_extensions(
if !Net::SSLeay::P_X509_REQ_add_extensions($req, $req,
&Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment', &Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment',
&Net::SSLeay::NID_basic_constraints => 'CA:FALSE', &Net::SSLeay::NID_basic_constraints => 'CA:FALSE',
&Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth', &Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth',
&Net::SSLeay::NID_subject_alt_name => join(',', map { "DNS:$_" } @$san), &Net::SSLeay::NID_subject_alt_name => join(',', map { "DNS:$_" } @$san),
); ) or $cleanup->(1, "Failed to add extensions to CSR\n");
$cleanup->(1, "Failed to set public key\n") $cleanup->(1, "Failed to set public key\n")
if !Net::SSLeay::X509_REQ_set_pubkey($req, $pk); if !Net::SSLeay::X509_REQ_set_pubkey($req, $pk);