summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTANABE Hiroyasu <h@cosat.com>2014-08-30 17:56:31 -0400
committerRich Salz <rsalz@openssl.org>2014-08-31 00:37:54 -0400
commit8475416fe7d72c373f3fa77d9d27d9f92342a6b8 (patch)
tree91ce61d15af24922db65706141d1a692478ae31b
parent30b7d5e1d83a2f5cb862361c180f7ba1f31a20a5 (diff)
RT1325,2973: Add more extensions to c_rehash
Add .crt/.cer/.crl to the filenames parsed. I also updated the podpage (since it didn't exist when this ticket was first created, nor when it was re-created seven years later). Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 80ec8d4e3ee212786dc3092b1c97305b871827f0)
-rw-r--r--doc/apps/c_rehash.pod5
-rw-r--r--tools/c_rehash.in2
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/apps/c_rehash.pod b/doc/apps/c_rehash.pod
index c564e86315..9f2a15b736 100644
--- a/doc/apps/c_rehash.pod
+++ b/doc/apps/c_rehash.pod
@@ -14,7 +14,8 @@ B<c_rehash>
=head1 DESCRIPTION
-B<c_rehash> scans directories and calculates a hash value of each C<.pem>
+B<c_rehash> scans directories and calculates a hash value of each
+C<.pem>, C<.crt>, C<.cer>, or C<.crl>
file in the specified directory list and creates symbolic links
for each file, where the name of the link is the hash value.
This utility is useful as many programs that use OpenSSL require
@@ -42,7 +43,7 @@ incrementing the B<D> value. Duplicates are found by comparing the
full SHA-1 fingerprint. A warning will be displayed if a duplicate
is found.
-A warning will also be displayed if there are B<.pem> files that
+A warning will also be displayed if there are files that
cannot be parsed as either a certificate or a CRL.
The program uses the B<openssl> program to compute the hashes and
diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index bfc4a69ed4..683b413df2 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -75,7 +75,7 @@ sub hash_dir {
}
}
closedir DIR;
- FILE: foreach $fname (grep {/\.pem$/} @flist) {
+ FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
# Check to see if certificates and/or CRLs present.
my ($cert, $crl) = check_file($fname);
if(!$cert && !$crl) {