diff options
Diffstat (limited to 'openssl/tools/c_rehash.in')
| -rw-r--r-- | openssl/tools/c_rehash.in | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/openssl/tools/c_rehash.in b/openssl/tools/c_rehash.in index 4497cbd9f..6dd3c24fc 100644 --- a/openssl/tools/c_rehash.in +++ b/openssl/tools/c_rehash.in @@ -15,13 +15,23 @@ if(defined $ENV{OPENSSL}) { $ENV{OPENSSL} = $openssl; } -$ENV{PATH} .= ":$dir/bin"; +my $pwd; +eval "require Cwd"; +if (defined(&Cwd::getcwd)) { + $pwd=Cwd::getcwd(); +} else { + $pwd=`pwd`; chomp($pwd); +} +my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':'; # DOS/Win32 or Unix delimiter? + +$ENV{PATH} .= "$path_delim$dir/bin"; if(! -x $openssl) { my $found = 0; - foreach (split /:/, $ENV{PATH}) { + foreach (split /$path_delim/, $ENV{PATH}) { if(-x "$_/$openssl") { $found = 1; + $openssl = "$_/$openssl"; last; } } @@ -34,11 +44,16 @@ if(! -x $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 $_) { @@ -101,7 +116,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/^.*=//; @@ -122,7 +137,11 @@ sub link_hash_cert { if ($symlink_exists) { symlink $fname, $hash; } 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; } $hashlist{$hash} = $fprint; } |