Support testcrypto.sh usage without including conf.sh

The only variable really needed for the script to work is the path to
the $KEYGEN binary. Allow setting this via an environment variable to
avoid loading conf.sh (and causing a chicken-egg problem). Also make
testcrypto.sh executable to allow its use from conf.sh.

(cherry picked from commit bb1c6bbdc701cdbadfe7c796acf8b5ecd719f1b9)

diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh
old mode 100644 (file)
new mode 100755 (executable)
index 023cd6d..e9dd0f9
--- a/bin/tests/system/testcrypto.sh
+++ b/bin/tests/system/testcrypto.sh
@@ -12,14 +12,17 @@
 # information regarding copyright ownership.
 
 SYSTEMTESTTOP=${SYSTEMTESTTOP:=..}
-. $SYSTEMTESTTOP/conf.sh
 
-prog=$0
+if test -z "$KEYGEN"; then
+    . $SYSTEMTESTTOP/conf.sh
+    alg="-a $DEFAULT_ALGORITHM -b $DEFAULT_BITS"
+else
+    alg=""
+fi
 
+prog=$0
 args=""
-alg="-a $DEFAULT_ALGORITHM -b $DEFAULT_BITS"
 quiet=0
-
 msg="cryptography"
 while test "$#" -gt 0; do
     case $1 in
@@ -63,6 +66,11 @@ while test "$#" -gt 0; do
     shift
 done
 
+if test -z "$alg"; then
+    echo "${prog}: no algorithm selected"
+    exit 1
+fi
+
 if $KEYGEN $args $alg foo > /dev/null 2>&1
 then
     rm -f Kfoo*