RT2772 update: c_rehash was broken

[openssl.git] / tools / c_rehash.in

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 69da98ff2cf2e71e58b5f2b26624696a084c8e43..887e9271254e49857e8bee23aaed9e79a971df27 100644 (file)
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -1,27 +1,65 @@
 #!/usr/local/bin/perl
 
-
 # Perl c_rehash script, scan all files in a directory
 # and add symbolic links to their hash values.
 
-my $openssl;
-
 my $dir;
+my $prefix;
+
+my $openssl = $ENV{OPENSSL} || "openssl";
+my $pwd;
+my $x509hash = "-subject_hash";
+my $crlhash = "-hash";
+my $verbose = 0;
+my $symlink_exists=eval {symlink("",""); 1};
+my $removelinks = 1;
+
+##  Parse flags.
+while ( $ARGV[0] =~ '-.*' ) {
+    my $flag = shift @ARGV;
+    last if ( $flag eq '--');
+    if ( $flag =~ /-old/) {
+           $x509hash = "-subject_hash_old";
+           $crlhash = "-hash_old";
+    } elsif ( $flag =~ /-h/) {
+           help();
+    } elsif ( $flag eq '-n' ) {
+           $removelinks = 0;
+    } elsif ( $flag eq '-v' ) {
+           $verbose++;
+    }
+    else {
+           print STDERR "Usage error; try -help.\n";
+           exit 1;
+    }
+}
+
+sub help {
+       print "Usage: c_rehash [-old] [-h] [-v] [dirs...]\n";
+       print "   -old use old-style digest\n";
+       print "   -h print this help text\n";
+       print "   -v print files removed and linked\n";
+       exit 0;
+}
 
-if(defined $ENV{OPENSSL}) {
-       $openssl = $ENV{OPENSSL};
+eval "require Cwd";
+if (defined(&Cwd::getcwd)) {
+       $pwd=Cwd::getcwd();
 } else {
-       $openssl = "openssl";
-       $ENV{OPENSSL} = $openssl;
+       $pwd=`pwd`;
+       chomp($pwd);
 }
 
-$ENV{PATH} .= ":$dir/bin";
+# DOS/Win32 or Unix delimiter?  Prefix our installdir, then search.
+my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':';
+$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
 
-if(! -f $openssl) {
+if(! -x $openssl) {
        my $found = 0;
-       foreach (split /:/, $ENV{PATH}) {
-               if(-f "$_/$openssl") {
+       foreach (split /$path_delim/, $ENV{PATH}) {
+               if(-x "$_/$openssl") {
                        $found = 1;
+                       $openssl = "$_/$openssl";
                        last;
                }       
        }
@@ -34,11 +72,16 @@ if(! -f $openssl) {
 if(@ARGV) {
        @dirlist = @ARGV;
 } elsif($ENV{SSL_CERT_DIR}) {
-       @dirlist = split /:/, $ENV{SSL_CERT_DIR};
+       @dirlist = split /$path_delim/, $ENV{SSL_CERT_DIR};
 } else {
        $dirlist[0] = "$dir/certs";
 }
 
+if (-d $dirlist[0]) {
+       chdir $dirlist[0];
+       $openssl="$pwd/$openssl" if (!-x $openssl);
+       chdir $pwd;
+}
 
 foreach (@dirlist) {
        if(-d $_ and -w $_) {
@@ -52,14 +95,17 @@ sub hash_dir {
        chdir $_[0];
        opendir(DIR, ".");
        my @flist = readdir(DIR);
-       # Delete any existing symbolic links
-       foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
-               if(-l $_) {
-                       unlink $_;
+       closedir DIR;
+       if ( $removelinks ) {
+               # Delete any existing symbolic links
+               foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
+                       if(-l $_) {
+                               unlink $_;
+                               print "unlink $_" if $verbose;
+                       }
                }
        }
-       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) {
@@ -100,7 +146,8 @@ sub check_file {
 
 sub link_hash_cert {
                my $fname = $_[0];
-               my ($hash, $fprint) = `$openssl x509 -hash -fingerprint -noout -in "$fname"`;
+               $fname =~ s/'/'\\''/g;
+               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;
@@ -116,12 +163,16 @@ sub link_hash_cert {
                        $suffix++;
                }
                $hash .= ".$suffix";
-               print "$fname => $hash\n";
-               $symlink_exists=eval {symlink("",""); 1};
                if ($symlink_exists) {
                        symlink $fname, $hash;
+                       print "link $fname -> $hash\n" if $verbose;
                } else {
-                       system ("cp", $fname, $hash);
+                       open IN,"<$fname" or die "can't open $fname for read";
+                       open OUT,">$hash" or die "can't open $hash for write";
+                       print OUT <IN>; # does the job for small text files
+                       close OUT;
+                       close IN;
+                       print "copy $fname -> $hash\n" if $verbose;
                }
                $hashlist{$hash} = $fprint;
 }
@@ -130,7 +181,8 @@ sub link_hash_cert {
 
 sub link_hash_crl {
                my $fname = $_[0];
-               my ($hash, $fprint) = `$openssl crl -hash -fingerprint -noout -in "$fname"`;
+               $fname =~ s/'/'\\''/g;
+               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;
@@ -146,12 +198,12 @@ sub link_hash_crl {
                        $suffix++;
                }
                $hash .= ".r$suffix";
-               print "$fname => $hash\n";
-               $symlink_exists=eval {symlink("",""); 1};
                if ($symlink_exists) {
                        symlink $fname, $hash;
+                       print "link $fname -> $hash\n" if $verbose;
                } else {
                        system ("cp", $fname, $hash);
+                       print "cp $fname -> $hash\n" if $verbose;
                }
                $hashlist{$hash} = $fprint;
 }