From: Mark Andrews <marka@isc.org>
Date: Thu, 10 Feb 2022 22:11:08 +0000 (+1100)
Subject: Only pass OPENSSL_CONF in the environment if it set
X-Git-Tag: v9.19.12~38^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=701ffb2daa8256227552850310d35cfd8526621d;p=thirdparty%2Fbind9.git

Only pass OPENSSL_CONF in the environment if it set

OPENSSL_CONF="" is treated differently to no OPENSSL_CONF in
the environment by OpenSSL.  OPENSSL_CONF="" lead to crypto
failure being reported in FIPS mode.
---

diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index d06f587732c..084efc47d8c 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -78,7 +78,7 @@ if ! $do_run; then
         SYSTEMTEST_FORCE_COLOR="$SYSTEMTEST_FORCE_COLOR" \
         SYSTEMTEST_NO_CLEAN="$SYSTEMTEST_NO_CLEAN" \
         SLOT="$SLOT" \
-        OPENSSL_CONF="$OPENSSL_CONF" \
+        ${OPENSSL_CONF:+OPENSSL_CONF="$OPENSSL_CONF"} \
         SOFTHSM2_CONF="$SOFTHSM2_CONF" \
         SOFTHSM2_MODULE="$SOFTHSM2_MODULE" \
         PATH="$PATH" \