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 1/2] certificate: add subroutine that checks if cert and key match
Date: Tue, 07 Mar 2023 11:52:29 +0100 [thread overview]
Message-ID: <1678186229.93k8jsrj2h.astroid@yuna.none> (raw)
In-Reply-To: <20230303175705.214121-2-m.carrara@proxmox.com>
with an added 'check_' prefix for the sub name to indicate that this will die if
the checked condition is not met.
On March 3, 2023 6:57 pm, Max Carrara wrote:
> This is done here in order to allow other packages to make use of
> this subroutine.
>
> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
> ---
> src/PVE/Certificate.pm | 41 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 41 insertions(+)
>
> diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
> index 31a7722..22de762 100644
> --- a/src/PVE/Certificate.pm
> +++ b/src/PVE/Certificate.pm
> @@ -228,6 +228,47 @@ sub get_certificate_fingerprint {
> return $fp;
> }
>
> +sub certificate_matches_key {
> + my ($cert_path, $key_path) = @_;
> +
> + die "No certificate path given!\n" if !$cert_path;
> + die "No certificate key path given!\n" if !$key_path;
> +
> + die "Certificate at '$cert_path' does not exist!\n" if ! -e $cert_path;
> + die "Certificate key '$key_path' does not exist!\n" if ! -e $key_path;
> +
> + my $ctx = Net::SSLeay::CTX_new()
> + or $ssl_die->(
> + "Failed to create SSL context in order to verify private key"
> + );
> +
> + eval {
> + my $filetype = &Net::SSLeay::FILETYPE_PEM;
> +
> + Net::SSLeay::CTX_use_PrivateKey_file($ctx, $key_path, $filetype)
> + or $ssl_die->(
> + "Failed to load private key from '$key_path' into SSL context"
> + );
> +
> + Net::SSLeay::CTX_use_certificate_file($ctx, $cert_path, $filetype)
> + or $ssl_die->(
> + "Failed to load certificate from '$cert_path' into SSL context"
> + );
> +
> + Net::SSLeay::CTX_check_private_key($ctx)
> + or $ssl_die->(
> + "Failed to validate private key and certificate"
> + );
> + };
> + my $err = $@;
> +
> + Net::SSLeay::CTX_free($ctx);
> +
> + die $err if $err;
> +
> + return 1;
> +}
> +
> sub get_certificate_info {
> my ($cert_path) = @_;
>
> --
> 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:53 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 ` Fabian Grünbichler [this message]
2023-03-07 17:47 ` [pve-devel] applied: " 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 ` [pve-devel] applied: " Fabian Grünbichler
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=1678186229.93k8jsrj2h.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