Various ssleay to openssl fixups

diff --git a/Makefile.org b/Makefile.org
index 90828b0cc5959299fd41d71a3810e795d14f29b9..c415184700ed5ef4fbc8649625559ad6bd6a2f44 100644 (file)
--- a/Makefile.org
+++ b/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

diff --git a/tools/c_hash b/tools/c_hash
index 54ff9d2cacc6e040befb86f943cb12ca79be4a1f..5e0a9081755db5e852a88de950b0ac101dc408c9 100644 (file)
--- a/tools/c_hash
+++ b/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

diff --git a/tools/c_info b/tools/c_info
index 5dd960b3a1ec30309764d2d6de56fe24e156ade2..0e1e633b6fb7c2bc8629a8b691c0da1a5aeed16c 100644 (file)
--- a/tools/c_info
+++ b/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 "--------"

diff --git a/tools/c_issuer b/tools/c_issuer
index a885b24b7baec599d2db49c91be9e2fb91a2ae9f..4c691201bb473cb93b5a13c55ca83fa0ea4acebe 100644 (file)
--- a/tools/c_issuer
+++ b/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

diff --git a/tools/c_name b/tools/c_name
index 4b33e68c5941268d2a8ffd8ff145a88512417e83..28800c0b30c1e854223446910bfef4ec4299a690 100644 (file)
--- a/tools/c_name
+++ b/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

diff --git a/tools/c_rehash b/tools/c_rehash
index 60c28595bd026f2a5f84d986fa1ca7dbbfc9dfcb..739a2de5507dd71c928dcc5f3f6060a9ea88173f 100644 (file)
--- a/tools/c_rehash
+++ b/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