From: Bodo Möller <bodo@openssl.org>
Date: Fri, 30 Mar 2001 09:23:14 +0000 (+0000)
Subject: Use enhanced bctest (as in main trunk), and add a workaround that
X-Git-Tag: OpenSSL_0_9_6a-beta3~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83c4e75be945664bf9e47408a19087f66a5b2017;p=oweals%2Fopenssl.git

Use enhanced bctest (as in main trunk), and add a workaround that
should solve the problems with FreeBSD's /bin/sh.
---

diff --git a/CHANGES b/CHANGES
index 96fbadd4d8..13c729abb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.6 and 0.9.6a  [xx XXX 2001]
 
+  *) Change bctest to avoid here-documents inside command substitution
+     (workaround for FreeBSD /bin/sh bug).
+     [Bodo Moeller]
+
   *) Rename 'des_encrypt' to 'des_encrypt1'.  This avoids the clashes
      with des_encrypt() defined on some operating systems, like Solaris
      and UnixWare.
@@ -29,6 +33,10 @@
      (but broken) behaviour.
      [Steve Henson]
 
+  *) Enhance bctest to search for a working bc along $PATH and print
+     it when found.
+     [Tim Rice <tim@multitalents.net> via Richard Levitte]
+
   *) Fix memory leaks in err.c: free err_data string if necessary;
      don't write to the wrong index in ERR_set_error_data.
      [Bodo Moeller]
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 8b353795cd..b4abd96e70 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -240,7 +240,7 @@ dclean:
 	mv -f Makefile.new $(MAKEFILE)
 
 clean:
-	rm -f .rnd tmp.bntest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log
+	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss log
 
 $(DLIBSSL):
 	(cd ../ssl; $(MAKE))
diff --git a/test/bctest b/test/bctest
index 6fa0663bb0..b9ef95bf82 100755
--- a/test/bctest
+++ b/test/bctest
@@ -11,8 +11,9 @@
 # running) bc.
 
 
-# Test for SunOS 5.[78] bc bug (or missing bc)
-if [ 0 != "`bc <<\EOF
+# Test for SunOS 5.[78] bc bug
+SunOStest() {
+${1} >tmp.bctest <<\EOF
 obase=16
 ibase=16
 a=AD88C418F31B3FC712D0425001D522B3AE9134FF3A98C13C1FCC1682211195406C1A6C66C6A\
@@ -26,17 +27,18 @@ b=DCE91E7D120B983EA9A104B5A96D634DD644C37657B1C7860B45E6838999B3DCE5A555583C6\
 8B3CD64126E1A82E190228020C05B91C8B141F1110086FC2A4C6ED631EBA129D04BB9A19FC53D\
 3ED0E2017D60A68775B75481449
 (a/b)*b + (a%b) - a
-EOF`" ]
+EOF
+if [ 0 != "`cat tmp.bctest`" ]
 then
-  echo "bc does not work.  Consider installing GNU bc." >&2
-  echo "cat >/dev/null"
-  exit 1
+  # failure
+  return 1
 fi
+}
 
 
 # Test for SCO bc bug.
-if [ "0
-0" != "`bc <<\EOF
+SCOtest() {
+${1} >tmp.bctest <<\EOF
 obase=16
 ibase=16
 -FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4AEC6F15AC177F176F2274D2\
@@ -62,23 +64,36 @@ F617E3145BBFBE9AFD0D6E437EA4FF6F04BC67C4F1458B4F0F47B64 - 1C2BBBB19B74E86FD32\
 9E8DB6A8C3B1B9986D57ED5419C2E855F7D5469E35E76334BB42F4C43E3F3A31B9697C171DAC4\
 D97935A7E1A14AD209D6CF811F55C6DB83AA9E6DFECFCD6669DED7171EE22A40C6181615CAF3F\
 5296964
-EOF`" ]
+EOF
+if [ "0
+0" != "`cat tmp.bctest`" ]
 then
-  echo "bc does not work.  Consider installing GNU bc." >&2
-  echo "cat >/dev/null"
-  exit 1
+  # failure
+  return 1
 fi
+}
 
 
-# bc works, good.
-# Now check if it knows the 'print' command.
-if [ "OK" = "`bc 2>/dev/null <<\EOF
-print \"OK\"
-EOF`" ]
-then
-    echo "bc"
-else
-    echo "sed 's/print.*//' | bc"
-fi
+IFS=:
+for dir in $PATH; do
+    bc="$dir/bc"
+
+    if [ -x "$bc" -a ! -d "$bc" ]; then
+        if SunOStest "$bc" && SCOtest "$bc"; then
+            # bc works; now check if it knows the 'print' command.
+            if [ "OK" = "`echo 'print \"OK\"' | $bc 2>/dev/null`" ]
+            then
+                echo "$bc"
+            else
+                echo "sed 's/print.*//' | $bc"
+            fi
+            exit 0
+        fi
+
+        echo "$bc does not work properly.  Looking for another bc ..." >&2
+    fi
+done
 
-exit 0
+echo "No working bc found.  Consider installing GNU bc." >&2
+echo "cat >/dev/null"
+exit 1