moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

mk-ca-bundle.pl: -m keeps ca cert meta data in output 

Makes the script pass on comments holding meta data to the output
file. Like fingerprinters, issuer, date ranges etc.

Closes #937
This commit is contained in:
Daniel Stenberg 2016-08-02 12:17:10 +02:00
parent bde2f09d5e
commit 600bb4e852
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/mk-ca-bundle.pl
View File

@ -6,7 +6,7 @@
# * | (__| |_| | _ <| |___ # * | (__| |_| | _ <| |___
# * \___|\___/|_| \_\_____| # * \___|\___/|_| \_\_____|
# * # *
# * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. # * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
# * # *
# * This software is licensed as described in the file COPYING, which # * This software is licensed as described in the file COPYING, which
# * you should have received as part of this distribution. The terms # * you should have received as part of this distribution. The terms
@ -34,7 +34,7 @@ use Getopt::Std;
use MIME::Base64; use MIME::Base64;
use LWP::UserAgent; use LWP::UserAgent;
use strict; use strict;
use vars qw($opt_b $opt_d $opt_f $opt_h $opt_i $opt_l $opt_n $opt_p $opt_q $opt_s $opt_t $opt_u $opt_v $opt_w); use vars qw($opt_b $opt_d $opt_f $opt_h $opt_i $opt_l $opt_m $opt_n $opt_p $opt_q $opt_s $opt_t $opt_u $opt_v $opt_w);
use List::Util; use List::Util;
use Text::Wrap; use Text::Wrap;
my $MOD_SHA = "Digest::SHA"; my $MOD_SHA = "Digest::SHA";
@ -62,7 +62,7 @@ $opt_d = 'release';
# If the OpenSSL commandline is not in search path you can configure it here! # If the OpenSSL commandline is not in search path you can configure it here!
my $openssl = 'openssl'; my $openssl = 'openssl';
my $version = '1.25'; my $version = '1.26';
$opt_w = 76; # default base64 encoded lines length $opt_w = 76; # default base64 encoded lines length
@ -109,7 +109,7 @@ my @valid_signature_algorithms = (
$0 =~ s@.*(/|\\)@@; $0 =~ s@.*(/|\\)@@;
$Getopt::Std::STANDARD_HELP_VERSION = 1; $Getopt::Std::STANDARD_HELP_VERSION = 1;
getopts('bd:fhilnp:qs:tuvw:'); getopts('bd:fhilmnp:qs:tuvw:');
if(!defined($opt_d)) { if(!defined($opt_d)) {
# to make plain "-d" use not cause warnings, and actually still work # to make plain "-d" use not cause warnings, and actually still work
@ -161,6 +161,7 @@ sub HELP_MESSAGE() {
print "\t-f\tforce rebuild even if certdata.txt is current\n"; print "\t-f\tforce rebuild even if certdata.txt is current\n";
print "\t-i\tprint version info about used modules\n"; print "\t-i\tprint version info about used modules\n";
print "\t-l\tprint license info about certdata.txt\n"; print "\t-l\tprint license info about certdata.txt\n";
print "\t-m\tinclude meta data in output\n";
print "\t-n\tno download of certdata.txt (to use existing)\n"; print "\t-n\tno download of certdata.txt (to use existing)\n";
print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n"; print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n";
print "\t\t Valid purposes are:\n"; print "\t\t Valid purposes are:\n";
@ -371,6 +372,7 @@ my $caname;
my $certnum = 0; my $certnum = 0;
my $skipnum = 0; my $skipnum = 0;
my $start_of_cert = 0; my $start_of_cert = 0;
my @precert;
open(TXT,"$txt") or die "Couldn't open $txt: $!\n"; open(TXT,"$txt") or die "Couldn't open $txt: $!\n";
while (<TXT>) { while (<TXT>) {
@ -383,11 +385,15 @@ while (<TXT>) {
last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/); last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/);
} }
} }
next if /^#|^\s*$/; elsif(/^# (Issuer|Serial Number|Subject|Not Valid Before|Not Valid After |Fingerprint \(MD5\)|Fingerprint \(SHA1\)):/) {
chomp; push @precert, $_;
if (/^CVS_ID\s+\"(.*)\"/) { next;
print CRT "# $1\n";
} }
elsif(/^#|^\s*$/) {
undef @precert;
next;
}
chomp;
# this is a match for the start of a certificate # this is a match for the start of a certificate
if (/^CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE/) { if (/^CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE/) {
@ -436,7 +442,7 @@ while (<TXT>) {
. $encoded . $encoded
. "-----END CERTIFICATE-----\n"; . "-----END CERTIFICATE-----\n";
print CRT "\n$caname\n"; print CRT "\n$caname\n";
print CRT @precert if($opt_m);
my $maxStringLength = length($caname); my $maxStringLength = length($caname);
if ($opt_t) { if ($opt_t) {
foreach my $key (keys %trust_purposes_by_level) { foreach my $key (keys %trust_purposes_by_level) {
@ -479,7 +485,9 @@ while (<TXT>) {
$certnum ++; $certnum ++;
$start_of_cert = 0; $start_of_cert = 0;
} }
undef @precert;
} }
} }
close(TXT) or die "Couldn't close $txt: $!\n"; close(TXT) or die "Couldn't close $txt: $!\n";
close(CRT) or die "Couldn't close $crt.~: $!\n"; close(CRT) or die "Couldn't close $crt.~: $!\n";