proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-25 22:06:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cert: move trailing newline into die helper

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-03-07 18:05:41 +01:00
parent 74bb32adde
commit e8a515e655
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PVE/Certificate.pm
View File

@ -181,7 +181,7 @@ sub der_to_pem {
my sub ssl_die { my sub ssl_die {
my ($msg) = @_; my ($msg) = @_;
Net::SSLeay::die_now($msg); Net::SSLeay::die_now("$msg\n");
}; };
my $ssl_warn = sub { my $ssl_warn = sub {
@ -196,7 +196,7 @@ my $read_certificate = sub {
die "'$cert_path' does not exist!\n" if ! -e $cert_path; die "'$cert_path' does not exist!\n" if ! -e $cert_path;
my $bio = Net::SSLeay::BIO_new_file($cert_path, 'r') my $bio = Net::SSLeay::BIO_new_file($cert_path, 'r')
or ssl_die("unable to read '$cert_path' - $!\n"); or ssl_die("unable to read '$cert_path' - $!");
my $cert = Net::SSLeay::PEM_read_bio_X509($bio); my $cert = Net::SSLeay::PEM_read_bio_X509($bio);
Net::SSLeay::BIO_free($bio); Net::SSLeay::BIO_free($bio);
@ -208,9 +208,9 @@ my $read_certificate = sub {
sub convert_asn1_to_epoch { sub convert_asn1_to_epoch {
my ($asn1_time) = @_; my ($asn1_time) = @_;
ssl_die("invalid ASN1 time object\n") if !$asn1_time; ssl_die("invalid ASN1 time object") if !$asn1_time;
my $iso_time = Net::SSLeay::P_ASN1_TIME_get_isotime($asn1_time); my $iso_time = Net::SSLeay::P_ASN1_TIME_get_isotime($asn1_time);
ssl_die("unable to parse ASN1 time\n") if $iso_time eq ''; ssl_die("unable to parse ASN1 time") if $iso_time eq '';
return Date::Parse::str2time($iso_time); return Date::Parse::str2time($iso_time);
} }
@ -389,7 +389,7 @@ sub generate_csr {
# this unfortunately causes a small memory leak, since there is no # this unfortunately causes a small memory leak, since there is no
# X509_NAME_free() (yet) # X509_NAME_free() (yet)
my $name = Net::SSLeay::X509_NAME_new(); my $name = Net::SSLeay::X509_NAME_new();
ssl_die("Failed to allocate X509_NAME object\n") if !$name; ssl_die("Failed to allocate X509_NAME object") if !$name;
my $add_name_entry = sub { my $add_name_entry = sub {
my ($k, $v) = @_; my ($k, $v) = @_;