Various ssleay to openssl fixups

Makefile.org

@@ -237,7 +237,7 @@ links:
 	(cd $$i && echo "making links in $$i..." && \
 	$(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
 	done;
-	@(SSLEAY="`pwd`/apps/openssl"; export SSLEAY; sh tools/c_rehash certs)
+	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 
 dclean:
 	/bin/rm -f *.bak

tools/c_hash

@@ -4,6 +4,6 @@
 
 for i in $*
 do
-	h=`ssleay x509 -hash -noout -in $i`
+	h=`openssl x509 -hash -noout -in $i`
 	echo "$h.0 => $i"
 done

tools/c_info

@@ -5,7 +5,7 @@
 
 for i in $*
 do
-	n=`ssleay x509 -subject -issuer -enddate -noout -in $i`
+	n=`openssl x509 -subject -issuer -enddate -noout -in $i`
 	echo "$i"
 	echo "$n"
 	echo "--------"

tools/c_issuer

@@ -5,6 +5,6 @@
 
 for i in $*
 do
-	n=`ssleay x509 -issuer -noout -in $i`
+	n=`openssl x509 -issuer -noout -in $i`
 	echo "$i\t$n"
 done

tools/c_name

@@ -5,6 +5,6 @@
 
 for i in $*
 do
-	n=`ssleay x509 -subject -noout -in $i`
+	n=`openssl x509 -subject -noout -in $i`
 	echo "$i	$n"
 done

tools/c_rehash

@@ -4,23 +4,23 @@
 # on the command line.
 #
 
-if [ "$SSLEAY"x = "x" -o ! -x "$SSLEAY" ]; then
-	SSLEAY='ssleay'
-	export SSLEAY
+if [ "$OPENSSL"x = "x" -o ! -x "$OPENSSL" ]; then
+	OPENSSL='openssl'
+	export OPENSSL
 fi
 DIR=/usr/local/ssl
 PATH=$DIR/bin:$PATH
 
-if [ ! -f "$SSLEAY" ]; then
+if [ ! -f "$OPENSSL" ]; then
     found=0
     for dir in . `echo $PATH | sed -e 's/:/ /g'`; do
-        if [ -f "$dir/$SSLEAY" ]; then
+        if [ -f "$dir/$OPENSSL" ]; then
             found=1
             break
         fi
     done
     if [ $found = 0 ]; then
-        echo "c_rehash: rehashing skipped ('ssleay' program still not available)" 1>&2
+        echo "c_rehash: rehashing skipped ('openssl' program still not available)" 1>&2
         exit 0
     fi
 fi
@@ -44,7 +44,7 @@ do
     for i in *.pem
     do
       if [ $i != '*.pem' ]; then
-        h=`$SSLEAY x509 -hash -noout -in $i`
+        h=`$OPENSSL x509 -hash -noout -in $i`
 	if [ "x$h" = "x" ]; then
 	  echo $i does not contain a certificate
 	else