From: Richard Levitte <levitte@openssl.org>
Date: Fri, 11 Oct 2002 20:35:45 +0000 (+0000)
Subject: Merge string protection from main trunk
X-Git-Tag: OpenSSL_0_9_7-beta4~122
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=449d39f41c99d5c4e226b9b319b9555e39788696;p=oweals%2Fopenssl.git

Merge string protection from main trunk
---

diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index c2e7d67f3b..4497cbd9f1 100644
--- 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/^.*=//;