Merge string protection from main trunk

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index c2e7d67f3bcab3bc0b6040d77d1fcad8f6583221..4497cbd9f178276df4131a710555c7ab1f0aff3f 100644 (file)
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -101,7 +101,7 @@ sub check_file {
 sub link_hash_cert {
                my $fname = $_[0];
                $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `$openssl x509 -hash -fingerprint -noout -in '$fname'`;
+               my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
                chomp $hash;
                chomp $fprint;
                $fprint =~ s/^.*=//;
@@ -131,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/^.*=//;