From b0f7a60d43590a6bce8192fe97b26e7b94b86a7f Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Thu, 22 Feb 2024 18:00:21 +0000 Subject: [PATCH] Unit test: Use 'easyrsa write safe-cnf' if 'make-safe-ssl' fails This is due to Linux test using EasyRSA-Master and Windows test using EasyRSA-release 3.1.x (currently) Signed-off-by: Richard T Bonhomme --- dev/easytls-unit-tests.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/easytls-unit-tests.sh b/dev/easytls-unit-tests.sh index b87ac98..7993dbd 100755 --- a/dev/easytls-unit-tests.sh +++ b/dev/easytls-unit-tests.sh @@ -662,7 +662,12 @@ elif [ -n "${EASYTLS_REMOTE_CI}" ]; then print "*** Update safessl-easyrsa.cnf - easyrsa init-pki" "${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch init-pki || fail "init-pki" - "${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch make-safe-ssl + if "${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch make-safe-ssl + then + : # ok + else + "${EASYRSA_CMD}" --pki-dir="${WORK_DIR}/et-tdir${loops}" --batch write safe-cnf || fail "write safe-cnf" + fi cp -vf "${WORK_DIR}/et-tdir${loops}/safessl-easyrsa.cnf" ./safessl-easyrsa.cnf || \ fail "(1) cp ${WORK_DIR}/et-tdir${loops}/safessl-easyrsa.cnf ./safessl-easyrsa.cnf"