From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E4B6585C5 for ; Fri, 3 Mar 2023 18:57:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C42C91A82C for ; Fri, 3 Mar 2023 18:57:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 3 Mar 2023 18:57:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A33EB48DBF for ; Fri, 3 Mar 2023 18:57:11 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 3 Mar 2023 18:57:03 +0100 Message-Id: <20230303175705.214121-3-m.carrara@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230303175705.214121-1-m.carrara@proxmox.com> References: <20230303175705.214121-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.033 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 common 2/2] certificate: fix formatting and whitespace X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2023 17:57:42 -0000 Signed-off-by: Max Carrara --- src/PVE/Certificate.pm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) NOTE: This patch can be dropped if not desired. diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm index 22de762..73091ff 100644 --- a/src/PVE/Certificate.pm +++ b/src/PVE/Certificate.pm @@ -400,19 +400,22 @@ sub generate_csr { $ssl_die->("Failed to allocate X509_NAME object\n") if !$name; my $add_name_entry = sub { my ($k, $v) = @_; - if (!Net::SSLeay::X509_NAME_add_entry_by_txt($name, - $k, - &Net::SSLeay::MBSTRING_UTF8, - encode('utf-8', $v))) { - $cleanup->(1, "Failed to add '$k'='$v' to DN\n"); - } + + my $res = Net::SSLeay::X509_NAME_add_entry_by_txt( + $name, + $k, + &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); for (qw(C ST L O OU)) { - if (defined(my $v = $attr{$_})) { + if (defined(my $v = $attr{$_})) { $add_name_entry->($_, $v); - } + } } if (defined($pem_key)) { @@ -445,13 +448,13 @@ sub generate_csr { $cleanup->(1, "Failed to set subject name\n") if (!Net::SSLeay::X509_REQ_set_subject_name($req, $name)); - $cleanup->(1, "Failed to add extensions to CSR\n") - if !Net::SSLeay::P_X509_REQ_add_extensions($req, - &Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment', - &Net::SSLeay::NID_basic_constraints => 'CA:FALSE', - &Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth', - &Net::SSLeay::NID_subject_alt_name => join(',', map { "DNS:$_" } @$san), - ); + Net::SSLeay::P_X509_REQ_add_extensions( + $req, + &Net::SSLeay::NID_key_usage => 'digitalSignature,keyEncipherment', + &Net::SSLeay::NID_basic_constraints => 'CA:FALSE', + &Net::SSLeay::NID_ext_key_usage => 'serverAuth,clientAuth', + &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") if !Net::SSLeay::X509_REQ_set_pubkey($req, $pk); -- 2.30.2