diff options
| author | Vladimir Kotal <vlada@devnull.cz> | 2018-06-07 10:44:30 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-06-08 09:37:56 +0200 |
| commit | 9ff67f7b00f16da9f9f3377b6b8f5859dd9cd2cb (patch) | |
| tree | dc5f6e884844bc069dd79405df5ed61a52bb1446 | |
| parent | b59cbf746f53d906fb4133da76b13d031dbde3da (diff) | |
| download | curl-9ff67f7b00f16da9f9f3377b6b8f5859dd9cd2cb.tar.gz | |
mk-ca-bundle.pl: leave certificate name untouched in decode()
Closes #2640
| -rwxr-xr-x | lib/mk-ca-bundle.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl index 5a84f6b0b..3dc5b6538 100755 --- a/lib/mk-ca-bundle.pl +++ b/lib/mk-ca-bundle.pl @@ -136,6 +136,7 @@ if ($opt_i) { print "Perl Version : $]\n"; print "Operating System Name : $^O\n"; print "Getopt::Std.pm Version : ${Getopt::Std::VERSION}\n"; + print "Encode::Encoding.pm Version : ${Encode::Encoding::VERSION}\n"; print "MIME::Base64.pm Version : ${MIME::Base64::VERSION}\n"; print "LWP::UserAgent.pm Version : ${LWP::UserAgent::VERSION}\n" if($LWP::UserAgent::VERSION); print "LWP.pm Version : ${LWP::VERSION}\n" if($LWP::VERSION); @@ -479,6 +480,7 @@ while (<TXT>) { if ( !should_output_cert(%trust_purposes_by_level) ) { $skipnum ++; + report "Skipping: $caname" if ($opt_v); } else { my $encoded = MIME::Base64::encode_base64($data, ''); $encoded =~ s/(.{1,${opt_w}})/$1\n/g; @@ -487,7 +489,7 @@ while (<TXT>) { . "-----END CERTIFICATE-----\n"; print CRT "\n$caname\n"; print CRT @precert if($opt_m); - my $maxStringLength = length(decode('UTF-8', $caname, Encode::FB_CROAK)); + my $maxStringLength = length(decode('UTF-8', $caname, Encode::FB_CROAK | Encode::LEAVE_SRC)); if ($opt_t) { foreach my $key (keys %trust_purposes_by_level) { my $string = $key . ": " . join(", ", @{$trust_purposes_by_level{$key}}); |