From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH v2 common 2/2] certificate: fix formatting and whitespace
Date: Tue, 07 Mar 2023 11:52:48 +0100 [thread overview]
Message-ID: <1678186360.3sgnee7nxc.astroid@yuna.none> (raw)
In-Reply-To: <20230303175705.214121-3-m.carrara@proxmox.com>
On March 3, 2023 6:57 pm, Max Carrara wrote:
> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
> ---
> 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
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
next prev parent reply other threads:[~2023-03-07 10:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 17:57 [pve-devel] [PATCH-SERIES v2 common/manager] Fix SSL Certificate and Key Upload Issues Max Carrara
2023-03-03 17:57 ` [pve-devel] [PATCH v2 common 1/2] certificate: add subroutine that checks if cert and key match Max Carrara
2023-03-07 10:52 ` [pve-devel] applied: " Fabian Grünbichler
2023-03-07 17:47 ` Thomas Lamprecht
2023-03-03 17:57 ` [pve-devel] [PATCH v2 common 2/2] certificate: fix formatting and whitespace Max Carrara
2023-03-07 10:52 ` Fabian Grünbichler [this message]
2023-03-03 17:57 ` [pve-devel] [PATCH v2 manager 1/2] fix #4552: certhelpers: check if custom cert and key match on change Max Carrara
2023-03-07 11:07 ` Fabian Grünbichler
2023-03-07 15:45 ` Max Carrara
2023-03-03 17:57 ` [pve-devel] [PATCH v2 manager 2/2] ui: cert upload: fix private key field sending empty string Max Carrara
2023-03-07 10:53 ` Fabian Grünbichler
2023-03-07 18:33 ` Thomas Lamprecht
2023-03-08 6:34 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1678186360.3sgnee7nxc.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox