Get rid of a nasty debugging message which was forgotten here...
[openssl.git] / tools / c_rehash
index 0076001..739a2de 100644 (file)
@@ -4,12 +4,26 @@
 # on the command line.
 #
 
 # on the command line.
 #
 
-if [ "$SSLEAY"x = "x" ]; then
-       SSLEAY='ssleay'
-       export SSLEAY
+if [ "$OPENSSL"x = "x" -o ! -x "$OPENSSL" ]; then
+       OPENSSL='openssl'
+       export OPENSSL
 fi
 DIR=/usr/local/ssl
 fi
 DIR=/usr/local/ssl
-#PATH=$DIR/bin:$PATH
+PATH=$DIR/bin:$PATH
+
+if [ ! -f "$OPENSSL" ]; then
+    found=0
+    for dir in . `echo $PATH | sed -e 's/:/ /g'`; do
+        if [ -f "$dir/$OPENSSL" ]; then
+            found=1
+            break
+        fi
+    done
+    if [ $found = 0 ]; then
+        echo "c_rehash: rehashing skipped ('openssl' program still not available)" 1>&2
+        exit 0
+    fi
+fi
 
 SSL_DIR=$DIR/certs
 
 
 SSL_DIR=$DIR/certs
 
@@ -30,7 +44,7 @@ do
     for i in *.pem
     do
       if [ $i != '*.pem' ]; then
     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
        if [ "x$h" = "x" ]; then
          echo $i does not contain a certificate
        else