Commit 57770349 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Fixed lost OpenSSL output with "-t" - followup. 

The previously applied patch didnt work on Windows; we cant rely
on shell commands like 'echo' since they act diffently on each
platform and each shell.
In order to keep this script platform-independent the code must
only use pure Perl.
parent f8da49ee

lib/mk-ca-bundle.pl

+13 −6
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ print CRT <<EOT; 
## This is a bundle of X.509 certificates of public Certificate Authorities

## (CA). These were automatically extracted from Mozilla's root certificates

## file (certdata.txt).  This file can be found in the mozilla source tree:

## $url

## ${url}

##

## It contains the certificates in ${format}PEM format and therefore

## can be directly used with curl / libcurl / php_curl, or with
@@ -201,11 +201,18 @@ while (<TXT>) { 
      print CRT ("=" x length($caname) . "\n");

      if (!$opt_t) {

        print CRT $pem;

      } else {

        my $pipe = "|$openssl x509 -md5 -fingerprint -text -inform PEM";

        if (!$stdout) {

          $pipe .= " >> $crt.~";

          close(CRT) or die "Couldn't close $crt.~: $!";

        }

        open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";

        print TMP $pem;

        close(TMP) or die "Couldn't close openssl pipe: $!";

        if (!$stdout) {

          open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";

        }

      if ($opt_t) {

        my $openssl_output = `echo '$pem' | $openssl x509 -md5 -fingerprint -text -inform PEM` or

          die "Couldn't run openssl : $?\n";

        print CRT $openssl_output;

      }

      print STDERR "Parsing: $caname\n" if ($opt_v);

      $certnum ++;