From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 22 Apr 2020 06:13:23 +0000 (+0200)
Subject: lib/mk-ca-bundle: skip empty certs
X-Git-Tag: curl-7_70_0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bffa1165357a5964c44794c253019375c2a80250;p=thirdparty%2Fcurl.git

lib/mk-ca-bundle: skip empty certs

Reviewed-by: Emil Engler
Reported-by: Ashwin Metpalli
Fixes #5278
Closes #5280
---

diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl
index 09e8e5b9bb..b9c7ed2579 100755
--- a/lib/mk-ca-bundle.pl
+++ b/lib/mk-ca-bundle.pl
@@ -63,7 +63,7 @@ $opt_d = 'release';
 # If the OpenSSL commandline is not in search path you can configure it here!
 my $openssl = 'openssl';
 
-my $version = '1.27';
+my $version = '1.28';
 
 $opt_w = 76; # default base64 encoded lines length
 
@@ -531,6 +531,11 @@ while (<TXT>) {
     } else {
       my $data = $cka_value;
       $cka_value = "";
+
+      if(!length($data)) {
+          # if empty, skip
+          next;
+      }
       my $encoded = MIME::Base64::encode_base64($data, '');
       $encoded =~ s/(.{1,${opt_w}})/$1\n/g;
       my $pem = "-----BEGIN CERTIFICATE-----\n"