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 52A9E8D6E for ; Tue, 7 Mar 2023 11:52:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 34D90AEB6 for ; Tue, 7 Mar 2023 11:52:57 +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 ; Tue, 7 Mar 2023 11:52:56 +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 0676442588 for ; Tue, 7 Mar 2023 11:52:56 +0100 (CET) Date: Tue, 07 Mar 2023 11:52:48 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230303175705.214121-1-m.carrara@proxmox.com> <20230303175705.214121-3-m.carrara@proxmox.com> In-Reply-To: <20230303175705.214121-3-m.carrara@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1678186360.3sgnee7nxc.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.123 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, certificate.pm] Subject: [pve-devel] applied: [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: Tue, 07 Mar 2023 10:52:57 -0000 On March 3, 2023 6:57 pm, Max Carrara wrote: > Signed-off-by: Max Carrara > --- > src/PVE/Certificate.pm | 33 ++++++++++++++++++--------------- > 1 file changed, 18 insertions(+), 15 deletions(-) >=20 > NOTE: This patch can be dropped if not desired. >=20 > 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 =3D sub { > my ($k, $v) =3D @_; > - if (!Net::SSLeay::X509_NAME_add_entry_by_txt($name, > - $k, > - &Net::SSLeay::MBSTRING_UTF= 8, > - encode('utf-8', $v))) { > - $cleanup->(1, "Failed to add '$k'=3D'$v' to DN\n"); > - } > + > + my $res =3D Net::SSLeay::X509_NAME_add_entry_by_txt( > + $name, > + $k, > + &Net::SSLeay::MBSTRING_UTF8, > + encode('utf-8', $v), > + ); > + > + $cleanup->(1, "Failed to add '$k'=3D'$v' to DN\n") if !$res; > }; > =20 > $add_name_entry->('CN', $common_name); > for (qw(C ST L O OU)) { > - if (defined(my $v =3D $attr{$_})) { > + if (defined(my $v =3D $attr{$_})) { > $add_name_entry->($_, $v); > - } > + } > } > =20 > 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)); > =20 > - $cleanup->(1, "Failed to add extensions to CSR\n") > - if !Net::SSLeay::P_X509_REQ_add_extensions($req, > - &Net::SSLeay::NID_key_usage =3D> 'digitalSignature,keyEncipherm= ent', > - &Net::SSLeay::NID_basic_constraints =3D> 'CA:FALSE', > - &Net::SSLeay::NID_ext_key_usage =3D> 'serverAuth,clientAuth', > - &Net::SSLeay::NID_subject_alt_name =3D> join(',', map { "DNS:$_= " } @$san), > - ); > + Net::SSLeay::P_X509_REQ_add_extensions( > + $req, > + &Net::SSLeay::NID_key_usage =3D> 'digitalSignature,keyEncipherment', > + &Net::SSLeay::NID_basic_constraints =3D> 'CA:FALSE', > + &Net::SSLeay::NID_ext_key_usage =3D> 'serverAuth,clientAuth', > + &Net::SSLeay::NID_subject_alt_name =3D> join(',', map { "DNS:$_" } @$sa= n), > + ) or $cleanup->(1, "Failed to add extensions to CSR\n"); > =20 > $cleanup->(1, "Failed to set public key\n") > if !Net::SSLeay::X509_REQ_set_pubkey($req, $pk); > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20