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 <[email protected]>
TinCanTech · Feb 22, 2024 · b0f7a60 · b0f7a60
1 parent 0cfe916
commit b0f7a60
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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"