From ba35a6df9cf4d18d1ccbfdf7a6130a48e5eef2b7 Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Mon, 7 Nov 2022 15:58:40 +0100
Subject: [PATCH] Force quiet mode when using testcrypto.sh directly

When testcrypto.sh is used as a standalone script, always use quiet mode
to avoid using undefined commands (such as echo_i) which require
inclusion of the entire conf.sh machinery.
---
 bin/tests/system/testcrypto.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh
index 72237777d9..2be22f3652 100755
--- a/bin/tests/system/testcrypto.sh
+++ b/bin/tests/system/testcrypto.sh
@@ -11,22 +11,27 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+prog=$0
+args=""
+quiet=0
+msg="cryptography"
+
 if test -z "$KEYGEN"; then
     . ../conf.sh
     alg="-a $DEFAULT_ALGORITHM -b $DEFAULT_BITS"
 else
     alg=""
+    quiet=1
+    args="-q"
 fi
 
-prog=$0
-args=""
-quiet=0
-msg="cryptography"
 while test "$#" -gt 0; do
     case $1 in
     -q)
-        args="$args -q"
-        quiet=1
+        if test $quiet -eq 0; then
+            args="$args -q"
+            quiet=1
+        fi
         ;;
     rsa|RSA|rsasha1|RSASHA1)
         alg="-a RSASHA1"