improve command line argument checking

[openssl.git] / tools / c_rehash.in

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 69da98ff2cf2e71e58b5f2b26624696a084c8e43..4497cbd9f178276df4131a710555c7ab1f0aff3f 100644 (file)
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -17,10 +17,10 @@ if(defined $ENV{OPENSSL}) {
 
 $ENV{PATH} .= ":$dir/bin";
 
-if(! -f $openssl) {
+if(! -x $openssl) {
        my $found = 0;
        foreach (split /:/, $ENV{PATH}) {
-               if(-f "$_/$openssl") {
+               if(-x "$_/$openssl") {
                        $found = 1;
                        last;
                }       
@@ -100,7 +100,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 -hash -fingerprint -noout -in '$fname'`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;
@@ -130,7 +131,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 -hash -fingerprint -noout -in '$fname'`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;