Skip to content

Commit 7a147e3

Browse files
Update mk-ca-bundle.pl script
1 parent 60b5058 commit 7a147e3

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

maint/mk-ca-bundle.pl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191

9292
my @valid_mozilla_trust_levels = (
9393
"TRUSTED_DELEGATOR", # CAs
94-
"NOT_TRUSTED", # Don't trust these certs.
95-
"MUST_VERIFY_TRUST", # This explicitly tells us that it ISN'T a CA but is
94+
"NOT_TRUSTED", # Do not trust these certs.
95+
"MUST_VERIFY_TRUST", # This explicitly tells us that it IS NOT a CA but is
9696
# otherwise ok. In other words, this should tell the
9797
# app to ignore any other sources that claim this is
9898
# a CA.
@@ -154,7 +154,7 @@ ()
154154
print " 2) Default to 'release', but more recent updates may be found in other trees\n";
155155
print " 3) certdata.txt file format may change, lag time to update this script\n";
156156
print " 4) Generally unwise to blindly trust CAs without manual review & verification\n";
157-
print " 5) Mozilla apps use additional security checks aren't represented in certdata\n";
157+
print " 5) Mozilla apps use additional security checks are not represented in certdata\n";
158158
print " 6) Use of this script will make a security engineer grind his teeth and\n";
159159
print " swear at you. ;)\n";
160160
exit;
@@ -241,7 +241,7 @@ ($$@)
241241
sub sha256 {
242242
my $result;
243243
if($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) {
244-
open(FILE, $_[0]) or die "Can't open '$_[0]': $!";
244+
open(FILE, $_[0]) or die "Could not open '$_[0]': $!";
245245
binmode(FILE);
246246
$result = $MOD_SHA->new(256)->addfile(*FILE)->hexdigest;
247247
close(FILE);
@@ -401,9 +401,9 @@ (%)
401401

402402
my $format = $opt_t ? "plain text and " : "";
403403
if($stdout) {
404-
open(CRT, '> -') or die "Couldn't open STDOUT: $!\n";
404+
open(CRT, '> -') or die "Could not open STDOUT: $!\n";
405405
} else {
406-
open(CRT,">$crt.~") or die "Couldn't open $crt.~: $!\n";
406+
open(CRT,">$crt.~") or die "Could not open $crt.~: $!\n";
407407
}
408408
print CRT <<EOT;
409409
##
@@ -442,7 +442,7 @@ (%)
442442
my $cka_value;
443443
my $valid = 0;
444444

445-
open(TXT,"$txt") or die "Couldn't open $txt: $!\n";
445+
open(TXT,"$txt") or die "Could not open $txt: $!\n";
446446
while(<TXT>) {
447447
if(/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) {
448448
print CRT;
@@ -629,34 +629,34 @@ (%)
629629
$pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM";
630630
if(!$stdout) {
631631
$pipe .= " >> $crt.~";
632-
close(CRT) or die "Couldn't close $crt.~: $!";
632+
close(CRT) or die "Could not close $crt.~: $!";
633633
}
634-
open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
634+
open(TMP, $pipe) or die "Could not open openssl pipe: $!";
635635
print TMP $pem;
636-
close(TMP) or die "Couldn't close openssl pipe: $!";
636+
close(TMP) or die "Could not close openssl pipe: $!";
637637
if(!$stdout) {
638-
open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
638+
open(CRT, ">>$crt.~") or die "Could not open $crt.~: $!";
639639
}
640640
}
641641
$pipe = "|$openssl x509 -text -inform PEM";
642642
if(!$stdout) {
643643
$pipe .= " >> $crt.~";
644-
close(CRT) or die "Couldn't close $crt.~: $!";
644+
close(CRT) or die "Could not close $crt.~: $!";
645645
}
646-
open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
646+
open(TMP, $pipe) or die "Could not open openssl pipe: $!";
647647
print TMP $pem;
648-
close(TMP) or die "Couldn't close openssl pipe: $!";
648+
close(TMP) or die "Could not close openssl pipe: $!";
649649
if(!$stdout) {
650-
open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
650+
open(CRT, ">>$crt.~") or die "Could not open $crt.~: $!";
651651
}
652652
}
653653
report "Processed: $caname" if($opt_v);
654654
$certnum++;
655655
}
656656
}
657657
}
658-
close(TXT) or die "Couldn't close $txt: $!\n";
659-
close(CRT) or die "Couldn't close $crt.~: $!\n";
658+
close(TXT) or die "Could not close $txt: $!\n";
659+
close(CRT) or die "Could not close $crt.~: $!\n";
660660
unless($stdout) {
661661
if($opt_b && -e $crt) {
662662
my $bk = 1;

0 commit comments

Comments
 (0)