tests: check_for_datefudge: don't exit the test programs

This makes check_for_datefudge not to immediately exit the program,
but to return non-zero to allow the tests by themselves to control the
behavior when "datefudge" is not found.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/tests/cert-reencoding.sh b/tests/cert-reencoding.sh
index aadd6fd1bd8be84d213f7f980fb8521d4967d326..240d3367784d16a90a18b146671b1abc5cc2de53 100755 (executable)
--- a/tests/cert-reencoding.sh
+++ b/tests/cert-reencoding.sh
@@ -57,7 +57,7 @@ export TZ="UTC"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 eval "${GETPORT}"
 # Port for gnutls-serv

diff --git a/tests/cert-tests/alt-chain b/tests/cert-tests/alt-chain
index b715416cc082d14e0374998f6268df4df9440a0b..a2261b3809e1dcf7007186d23abfa0abcf8d4bff 100755 (executable)
--- a/tests/cert-tests/alt-chain
+++ b/tests/cert-tests/alt-chain
@@ -36,7 +36,7 @@ OUTFILE=out-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 OLD_CA_FILE="${srcdir}/data/alt-chain-old-ca.pem"
 NEW_CA_FILE="${srcdir}/data/alt-chain-new-ca.pem"

diff --git a/tests/cert-tests/cert-critical b/tests/cert-tests/cert-critical
index 74f335cb87245276fc0193779273a1c70c8ba14f..f923b29fa43ff4816088548f28ceb53985b0b8b1 100755 (executable)
--- a/tests/cert-tests/cert-critical
+++ b/tests/cert-tests/cert-critical
@@ -36,7 +36,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge "2017-2-28" \
 ${VALGRIND} "${CERTTOOL}" --verify-chain --infile ${srcdir}/data/chain-with-critical-on-root.pem

diff --git a/tests/cert-tests/cert-non-digits-time b/tests/cert-tests/cert-non-digits-time
index 28880b87ac7390eb6ae0a7c1485c0536a6fb2ac7..9c25c396de4fafdeac8d9462a83ea22231d9a52a 100755 (executable)
--- a/tests/cert-tests/cert-non-digits-time
+++ b/tests/cert-tests/cert-non-digits-time
@@ -32,7 +32,7 @@ if ! test -z "${VALGRIND}"; then
     VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Check whether certificates with non-digits time fields are accepted
 datefudge -s "2019-12-19" \

diff --git a/tests/cert-tests/certtool b/tests/cert-tests/certtool
index 3494aaacbed1b827e122ad4fdc9a3f5b2d6b6831..0fd29beea9eed6ddf25aad7479cfcd5fed66ff60 100755 (executable)
--- a/tests/cert-tests/certtool
+++ b/tests/cert-tests/certtool
@@ -171,7 +171,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 cat "${srcdir}/../certs/cert-ecc256.pem" "${srcdir}/../certs/ca-cert-ecc.pem"|datefudge "2012-11-22" \
 ${VALGRIND} "${CERTTOOL}" --verify-chain

diff --git a/tests/cert-tests/certtool-eddsa b/tests/cert-tests/certtool-eddsa
index c097fbf6c6d429a9dfc25ec75328b1b98a39741c..7e078225077e96e9db804e8462debb6142b44f65 100755 (executable)
--- a/tests/cert-tests/certtool-eddsa
+++ b/tests/cert-tests/certtool-eddsa
@@ -124,7 +124,7 @@ rm -f "${TMPFILE}" "${TMPFILE2}"
 rm -f "${KEYFILE}"
 
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Test certificate chain using Ed25519
 datefudge "2017-7-6" \

diff --git a/tests/cert-tests/certtool-rsa-pss b/tests/cert-tests/certtool-rsa-pss
index aed79ff2e26b204f5cf859a11cd15f96807161f8..654bf34869c1b3a78a3d88d5340b6049cfc5477b 100755 (executable)
--- a/tests/cert-tests/certtool-rsa-pss
+++ b/tests/cert-tests/certtool-rsa-pss
@@ -210,7 +210,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge "2012-11-22" \
 ${VALGRIND} "${CERTTOOL}" --verify --load-ca-certificate "${srcdir}/data/cert-rsa-pss.pem" --infile "${srcdir}/data/cert-rsa-pss.pem"

diff --git a/tests/cert-tests/certtool-verify-profiles b/tests/cert-tests/certtool-verify-profiles
index a7ebd711eaf5cd9c02c1ec52761afe1a2384c301..a4d738627e3e408652aec66acbffa4d8b0dba174 100755 (executable)
--- a/tests/cert-tests/certtool-verify-profiles
+++ b/tests/cert-tests/certtool-verify-profiles
@@ -36,7 +36,7 @@ OUTFILE=out-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 echo "Checking chain with insecure leaf"
 datefudge -s "2019-12-19" \

diff --git a/tests/cert-tests/crl b/tests/cert-tests/crl
index 62b320b2bf0ab647ba4b7f8a8166f7f8376fef70..f4f97d757bdc7b1b910099bc96d689a441a25f90 100755 (executable)
--- a/tests/cert-tests/crl
+++ b/tests/cert-tests/crl
@@ -171,7 +171,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge -s "2020-01-20 10:00:00" ${VALGRIND} \
        "${CERTTOOL}" --generate-crl --load-ca-privkey "${srcdir}/data/template-test.key" \

diff --git a/tests/cert-tests/crq b/tests/cert-tests/crq
index 89099cfc0a52ae917d43191e8c5256ca29c6d441..1d64dee27ec888eea614aa386d784ba48caa3a43 100755 (executable)
--- a/tests/cert-tests/crq
+++ b/tests/cert-tests/crq
@@ -40,7 +40,7 @@ OUTFILE2=out2.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 ${VALGRIND} "${CERTTOOL}" --inder --crq-info --infile "${srcdir}/data/csr-invalid.der" >"${OUTFILE}" 2>&1
 rc=$?

diff --git a/tests/cert-tests/inhibit-anypolicy b/tests/cert-tests/inhibit-anypolicy
index 7e82a20014d72dfec961185e99911baf62b6c198..ba5e1100f6aad7335ceea9515a9ec237b492fb8c 100755 (executable)
--- a/tests/cert-tests/inhibit-anypolicy
+++ b/tests/cert-tests/inhibit-anypolicy
@@ -36,7 +36,7 @@ SUBCAFILE=inhibit-subca.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge -s "2017-04-22" \
        "${CERTTOOL}" --generate-self-signed \

diff --git a/tests/cert-tests/krb5-test b/tests/cert-tests/krb5-test
index 3eca7d7e312b65d5d1efc2b172941d2bbdfe5761..a6e092cc90a6b0c65626d82ed878fa03a202121c 100755 (executable)
--- a/tests/cert-tests/krb5-test
+++ b/tests/cert-tests/krb5-test
@@ -34,7 +34,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 if ! test -z "${VALGRIND}"; then
        ORIG_VALGRIND=${VALGRIND}

diff --git a/tests/cert-tests/md5-test b/tests/cert-tests/md5-test
index a9635cc1d840c7ee39a1ec6149080083edeec02a..15d6280b1c08117f709f8399f63c1242c27768fb 100755 (executable)
--- a/tests/cert-tests/md5-test
+++ b/tests/cert-tests/md5-test
@@ -34,7 +34,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Test MD5 signatures
 

diff --git a/tests/cert-tests/name-constraints b/tests/cert-tests/name-constraints
index f23462117e53cc06fddf43a556134b8953b4903e..3b2370d49a7d84e0f372af1f6c9c8b85964a12f3 100755 (executable)
--- a/tests/cert-tests/name-constraints
+++ b/tests/cert-tests/name-constraints
@@ -36,7 +36,7 @@ TMPFILE=constraints.$$.pem.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge -s "2016-04-22" \
        ${VALGRIND} "${CERTTOOL}" --verify-allow-broken -e --infile "${srcdir}/data/name-constraints-ip.pem"

diff --git a/tests/cert-tests/othername-test b/tests/cert-tests/othername-test
index 38032fee1cdb4baf25dba102831d7447fe0f7e96..00f93b22dde9283675f4e972a5331005ade17a79 100755 (executable)
--- a/tests/cert-tests/othername-test
+++ b/tests/cert-tests/othername-test
@@ -33,7 +33,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Note that in rare cases this test may fail because the
 # time set using datefudge could have changed since the generation

diff --git a/tests/cert-tests/pkcs1-pad b/tests/cert-tests/pkcs1-pad
index 33663a6a0b981cd1d2b35eb8aa7eb0e03b0f87f7..c75ab9e09d05b2a50198122a4feab25f54ad8e95 100755 (executable)
--- a/tests/cert-tests/pkcs1-pad
+++ b/tests/cert-tests/pkcs1-pad
@@ -34,7 +34,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 TMPFILE1=pkcs1-pad.$$.tmp
 TMPFILE2=pkcs1-pad-2.$$.tmp

diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7
index 35d438107e0a2a37cdf0b12648ab98f2cf63d003..23db9e017ecf159b8d659a12321071a8f91ca681 100755 (executable)
--- a/tests/cert-tests/pkcs7
+++ b/tests/cert-tests/pkcs7
@@ -38,7 +38,7 @@ TMPFILE=tmp-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 if test "${ENABLE_GOST}" = "1" && test "${GNUTLS_FORCE_FIPS_MODE}" != "1"
 then

diff --git a/tests/cert-tests/pkcs7-cat b/tests/cert-tests/pkcs7-cat
index 0f5b82df12aa734c303c7d069205652c70b07cb2..65433974316d37c4c9b5f75e40820872773ab3c5 100755 (executable)
--- a/tests/cert-tests/pkcs7-cat
+++ b/tests/cert-tests/pkcs7-cat
@@ -36,7 +36,7 @@ OUTFILE=out-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 datefudge -s "2016-10-1" \
 ${VALGRIND} "${CERTTOOL}" --verify-allow-broken --p7-verify --inder --infile "${srcdir}/data/pkcs7-cat.p7" --load-ca-certificate "${srcdir}/data/pkcs7-cat-ca.pem" 
 rc=$?

diff --git a/tests/cert-tests/pkcs7-constraints b/tests/cert-tests/pkcs7-constraints
index 8e5b5345d1cea47ba361352e01d29ccb1da98e25..6964d26f099f9154a4fb9617fdf698ad9133d109 100755 (executable)
--- a/tests/cert-tests/pkcs7-constraints
+++ b/tests/cert-tests/pkcs7-constraints
@@ -36,7 +36,7 @@ OUTFILE=out-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 
 FILE="signing"

diff --git a/tests/cert-tests/pkcs7-constraints2 b/tests/cert-tests/pkcs7-constraints2
index 389071e27b50aee07de526f3116b53b1d6d9e758..7d1816a33ad1696ea356788ab4495d272d92fe98 100755 (executable)
--- a/tests/cert-tests/pkcs7-constraints2
+++ b/tests/cert-tests/pkcs7-constraints2
@@ -36,7 +36,7 @@ OUTFILE=out-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 
 FILE="signing"

diff --git a/tests/cert-tests/pkcs7-eddsa b/tests/cert-tests/pkcs7-eddsa
index 1fd767bd7352d0cae2ed0f0dc855c83c7428d01f..6f235c512b638501cf0814386a000463ff65634f 100755 (executable)
--- a/tests/cert-tests/pkcs7-eddsa
+++ b/tests/cert-tests/pkcs7-eddsa
@@ -36,7 +36,7 @@ OUTFILE2=out2-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 KEY="${srcdir}/../certs/ed25519.pem"
 CERT="${srcdir}/../certs/cert-ed25519.pem"

diff --git a/tests/cert-tests/pkcs7-list-sign b/tests/cert-tests/pkcs7-list-sign
index 1c4e930e5bff49d4654c4644cffd2f546f51dc17..5ca04d8005757e93fcedbe602bc7316683bd6733 100755 (executable)
--- a/tests/cert-tests/pkcs7-list-sign
+++ b/tests/cert-tests/pkcs7-list-sign
@@ -37,7 +37,7 @@ OUTFILE2=out2-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 # Test signing
 FILE="signing-with-cert-list"
 ${VALGRIND} "${CERTTOOL}" --p7-sign --load-certificate "${srcdir}/data/pkcs7-chain.pem" --load-privkey "${srcdir}/data/pkcs7-chain-endcert-key.pem" --infile "${srcdir}/data/pkcs7-detached.txt" >"${OUTFILE}"

diff --git a/tests/cert-tests/rsa-pss-pad b/tests/cert-tests/rsa-pss-pad
index d9a05e4e0f9fdb0639bc0a8c4d2a57645be9957d..2c87c750fc9d167c975d84ee94706261891dbb16 100755 (executable)
--- a/tests/cert-tests/rsa-pss-pad
+++ b/tests/cert-tests/rsa-pss-pad
@@ -33,7 +33,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Note that in rare cases this test may fail because the
 # time set using datefudge could have changed since the generation

diff --git a/tests/cert-tests/sha3-test b/tests/cert-tests/sha3-test
index dc3cf8f6bad756587c2df1f381ea0f280ca6a616..a4300672c3cc1ec02aa974c0ae18d3ca4034fcd7 100755 (executable)
--- a/tests/cert-tests/sha3-test
+++ b/tests/cert-tests/sha3-test
@@ -33,7 +33,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Note that in rare cases this test may fail because the
 # time set using datefudge could have changed since the generation

diff --git a/tests/cert-tests/smime b/tests/cert-tests/smime
index dd5514f687e1d0c6def0b7d14f24b08d1276bbde..f5e68401cf242cc22298e71ea9ee20ca5744cffe 100755 (executable)
--- a/tests/cert-tests/smime
+++ b/tests/cert-tests/smime
@@ -36,7 +36,7 @@ OUTFILE=out-pkcs7.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # test the --smime-to-p7 functionality
 ${VAGRLIND} "${CERTTOOL}" --smime-to-p7 --infile "${srcdir}/data/pkcs7.smime" --outfile ${OUTFILE}

diff --git a/tests/cert-tests/template-exts-test b/tests/cert-tests/template-exts-test
index 32e90f91e3790d5f64531280ade280de51f1dfe0..276ba2f7982f494c01969a49e94759d8d6a29f10 100755 (executable)
--- a/tests/cert-tests/template-exts-test
+++ b/tests/cert-tests/template-exts-test
@@ -33,7 +33,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge -s "2007-04-22" \
        "${CERTTOOL}" --generate-self-signed \

diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test
index f7ebefb664a2d26d2e1d33baf4c01a8da8d5ffd8..091021315b05d42bfb807371df6f13160b3868a4 100755 (executable)
--- a/tests/cert-tests/template-test
+++ b/tests/cert-tests/template-test
@@ -34,7 +34,7 @@ TMPFILE=tmp-tt.pem.$$.tmp
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 echo "Running test for ${ac_cv_sizeof_time_t}-byte time_t"
 

diff --git a/tests/cert-tests/tlsfeature-test b/tests/cert-tests/tlsfeature-test
index aadbffc26ab77553304e8bda3878b0b77fdf94af..fb26f6225bbafc11bc0b03077bb199267a96039a 100755 (executable)
--- a/tests/cert-tests/tlsfeature-test
+++ b/tests/cert-tests/tlsfeature-test
@@ -34,7 +34,7 @@ export TZ="UTC"
 
 . ${srcdir}/../scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 #
 # Test certificate generation

diff --git a/tests/certtool-pkcs11.sh b/tests/certtool-pkcs11.sh
index 9a599e614622219dcb6b9232cb1892f2bc230117..daba535a4da99f73717699dbfa9ae4af02400f9c 100755 (executable)
--- a/tests/certtool-pkcs11.sh
+++ b/tests/certtool-pkcs11.sh
@@ -68,7 +68,7 @@ exit_error () {
        exit 1
 }
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # $1: token
 # $2: PIN

diff --git a/tests/gnutls-cli-debug.sh b/tests/gnutls-cli-debug.sh
index 0ab6069b8fe78fd49e28bd09d796a4b8dbc6322c..33517642167ecd7cd51a8aaaad5652569456c8aa 100755 (executable)
--- a/tests/gnutls-cli-debug.sh
+++ b/tests/gnutls-cli-debug.sh
@@ -48,7 +48,7 @@ SERV="${SERV} -q"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 
 KEY1=${srcdir}/../doc/credentials/x509/key-rsa.pem

diff --git a/tests/gnutls-cli-invalid-crl.sh b/tests/gnutls-cli-invalid-crl.sh
index d7383a555bf2dc9731b974c1b92e8a384cfca5b0..1a82bfafd3db0dbc565d19e950959d3f6dd02f19 100755 (executable)
--- a/tests/gnutls-cli-invalid-crl.sh
+++ b/tests/gnutls-cli-invalid-crl.sh
@@ -47,7 +47,7 @@ SERV="${SERV} -q"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 echo "Checking whether connecting to a server but with an invalid CRL provided, returns the expected error"
 

diff --git a/tests/gnutls-cli-self-signed.sh b/tests/gnutls-cli-self-signed.sh
index 07cd5824b8434e83e84ea7b1ab5a49a006586915..fbb5375bf0534af835a3d9e514795f6fe2fc31ae 100755 (executable)
--- a/tests/gnutls-cli-self-signed.sh
+++ b/tests/gnutls-cli-self-signed.sh
@@ -45,7 +45,7 @@ SERV="${SERV} -q"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 echo "Checking whether connecting to a self signed certificate returns the expected error"
 

diff --git a/tests/ocsp-tests/ocsp-load-chain b/tests/ocsp-tests/ocsp-load-chain
index 04de48f7edc619e15b305431764455c67c18f375..0822bc3d99ffe2e385b029e4b7aeeca9f4c90fee 100755 (executable)
--- a/tests/ocsp-tests/ocsp-load-chain
+++ b/tests/ocsp-tests/ocsp-load-chain
@@ -31,7 +31,7 @@ export TZ="UTC"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge -s "2017-06-19" \
        "${OCSPTOOL}" -e --load-chain "${srcdir}/ocsp-tests/certs/chain-amazon.com.pem" --infile "${srcdir}/ocsp-tests/certs/ocsp-amazon.com.der" --verify-allow-broken

diff --git a/tests/ocsp-tests/ocsp-must-staple-connection b/tests/ocsp-tests/ocsp-must-staple-connection
index 490cc032f0d4cef96751ad6abb3c562103874082..49c355dda39878a9f9a311e37853a529866eac94 100755 (executable)
--- a/tests/ocsp-tests/ocsp-must-staple-connection
+++ b/tests/ocsp-tests/ocsp-must-staple-connection
@@ -53,7 +53,7 @@ fi
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 eval "${GETPORT}"
 # Port for gnutls-serv

diff --git a/tests/ocsp-tests/ocsp-test b/tests/ocsp-tests/ocsp-test
index 3730175208ac969279c2d3b1410083f7b4e13ed1..bc2641a22e9582390cc496345be3973b4e273cec 100755 (executable)
--- a/tests/ocsp-tests/ocsp-test
+++ b/tests/ocsp-tests/ocsp-test
@@ -32,7 +32,7 @@ export TZ="UTC"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 # Note that in rare cases this test may fail because the
 # time set using datefudge could have changed since the generation

diff --git a/tests/ocsp-tests/ocsp-tls-connection b/tests/ocsp-tests/ocsp-tls-connection
index bcc77ec2d9c7645f6a8b8da76f02f22152d08037..870f4ff78b2335df58928f260ac1800446c07e6c 100755 (executable)
--- a/tests/ocsp-tests/ocsp-tls-connection
+++ b/tests/ocsp-tests/ocsp-tls-connection
@@ -54,7 +54,7 @@ export TZ="UTC"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 eval "${GETPORT}"
 # Port for gnutls-serv

diff --git a/tests/pkcs7-cat.sh b/tests/pkcs7-cat.sh
index 2f3b0b0b3533d98bd32390653257410997438154..a7a53a431a00a689e72412cd79ecbed965d11ce4 100755 (executable)
--- a/tests/pkcs7-cat.sh
+++ b/tests/pkcs7-cat.sh
@@ -34,7 +34,7 @@ fi
 
 . ${srcdir}/scripts/common.sh
 
-check_for_datefudge
+skip_if_no_datefudge
 
 #try verification
 datefudge -s "2010-10-10" \

diff --git a/tests/rsa-md5-collision/rsa-md5-collision.sh b/tests/rsa-md5-collision/rsa-md5-collision.sh
index a935804dc08a09a768b8f8a34336730120a543f1..e319544b7370a594eb8d013a2b6e366036aff035 100755 (executable)
--- a/tests/rsa-md5-collision/rsa-md5-collision.sh
+++ b/tests/rsa-md5-collision/rsa-md5-collision.sh
@@ -31,7 +31,7 @@ if ! test -x "${CERTTOOL}"; then
 fi
 
 . ${srcdir}/scripts/common.sh
-check_for_datefudge
+skip_if_no_datefudge
 
 # Disable leak detection
 ASAN_OPTIONS="detect_leaks=0"

diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh
index 95f8a5298e3a10175a6909ca82ef8a5699f4c883..6ae19fa586858809adb655199f7dfa1ec71c9081 100644 (file)
--- a/tests/scripts/common.sh
+++ b/tests/scripts/common.sh
@@ -80,7 +80,12 @@ check_for_datefudge() {
 
        TSTAMP=`datefudge -s "2006-09-23" "${top_builddir}/tests/datefudge-check" || true`
        if test "$TSTAMP" != "1158969600" || test "$WINDOWS" = 1; then
-       echo $TSTAMP
+               return 1
+       fi
+}
+
+skip_if_no_datefudge() {
+       if ! check_for_datefudge; then
                echo "You need datefudge to run this test"
                exit 77
        fi

diff --git a/tests/server-multi-keys.sh b/tests/server-multi-keys.sh
index 3138fb6888bd73ef406455443b8d546c3f87b39a..7737ec9b83ffcc3f819be0e1640b6e3d72991a76 100755 (executable)
--- a/tests/server-multi-keys.sh
+++ b/tests/server-multi-keys.sh
@@ -46,7 +46,7 @@ SERV="${SERV} -q"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 echo "Checking whether server can utilize multiple keys"
 

diff --git a/tests/server-weak-keys.sh b/tests/server-weak-keys.sh
index 31c51a80bc46f79a9b55c3ec2d2af18d68cd04ef..1fa14711fb4928845045381e78c10d25321f21a3 100755 (executable)
--- a/tests/server-weak-keys.sh
+++ b/tests/server-weak-keys.sh
@@ -46,7 +46,7 @@ SERV="${SERV} -q"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 echo "Checking whether a client will refuse weak but trusted keys"
 

diff --git a/tests/suite/testcompat-oldgnutls.sh b/tests/suite/testcompat-oldgnutls.sh
index 2ec96b20c2d8f383deac16b0ea53dda150dd2675..937bf57050c27c39e82b87f85fa3b4182c4b3b6a 100755 (executable)
--- a/tests/suite/testcompat-oldgnutls.sh
+++ b/tests/suite/testcompat-oldgnutls.sh
@@ -54,7 +54,7 @@ LDPATH=/usr/local/OLDGNUTLS/lib/x86_64-linux-gnu:/usr/local/OLDGNUTLS/usr/lib/x8
 
 . "${srcdir}/../scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 . "${srcdir}/testcompat-common"
 

diff --git a/tests/suite/testcompat-openssl.sh b/tests/suite/testcompat-openssl.sh
index bfc59c09ac306a1485104849b0788a03b2cf8918..b932a599c9ba2191a049fd1b8acb7d38fdb4b11f 100755 (executable)
--- a/tests/suite/testcompat-openssl.sh
+++ b/tests/suite/testcompat-openssl.sh
@@ -54,7 +54,7 @@ export TZ="UTC"
 # Check for datefudge
 . "${srcdir}/../scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 timeout 1800 datefudge "2012-09-2" "${srcdir}/testcompat-main-openssl"
 

diff --git a/tests/suite/testcompat-polarssl.sh b/tests/suite/testcompat-polarssl.sh
index 1af0099dca64bcc2f82824b17a4fba6df9a5d094..2197a94bf762bec5897e8a04ae09d56870701624 100755 (executable)
--- a/tests/suite/testcompat-polarssl.sh
+++ b/tests/suite/testcompat-polarssl.sh
@@ -42,7 +42,7 @@ fi
 # Check for datefudge
 . "${srcdir}/../scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 cat /proc/cpuinfo|grep "model name"|grep "VIA Esther" >/dev/null 2>&1
 if test $? = 0; then

diff --git a/tests/suite/testcompat-tls13-openssl.sh b/tests/suite/testcompat-tls13-openssl.sh
index 128873ab231c4f06aeb4d9fb8269918400492738..bc198a02b69152a769a5a3a212245788f9b0b7e8 100755 (executable)
--- a/tests/suite/testcompat-tls13-openssl.sh
+++ b/tests/suite/testcompat-tls13-openssl.sh
@@ -49,7 +49,7 @@ fi
 
 . "${srcdir}/../scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 . "${srcdir}/testcompat-common"
 

diff --git a/tests/system-override-profiles.sh b/tests/system-override-profiles.sh
index 88ec631798d319e741aaa35b50d87a511fe274dc..516ce57e71f6826f8a7c603062170b296c9c4287 100755 (executable)
--- a/tests/system-override-profiles.sh
+++ b/tests/system-override-profiles.sh
@@ -41,7 +41,7 @@ fi
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 CERT="${srcdir}/certs/cert-ecc256.pem"
 KEY="${srcdir}/certs/ecc256.pem"

diff --git a/tests/system-override-tls.sh b/tests/system-override-tls.sh
index 6114d762827a6601128f5c4eea121c89dfca5270..54bc190dd9fcc9131c25821fb6cc4ada5c67975f 100755 (executable)
--- a/tests/system-override-tls.sh
+++ b/tests/system-override-tls.sh
@@ -40,7 +40,7 @@ fi
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 CERT="${srcdir}/certs/cert-ecc256.pem"
 KEY="${srcdir}/certs/ecc256.pem"

diff --git a/tests/tls13/prf-early.sh b/tests/tls13/prf-early.sh
index b19da4cb651061d9e153762d473ff9c7191fe062..7f62aba8d87748c283746a93de970345ae4dbca8 100755 (executable)
--- a/tests/tls13/prf-early.sh
+++ b/tests/tls13/prf-early.sh
@@ -23,7 +23,7 @@ builddir="${builddir:-.}"
 
 . "${srcdir}/scripts/common.sh"
 
-check_for_datefudge
+skip_if_no_datefudge
 
 datefudge -s 2019-04-12 "${builddir}/tls13/prf-early" "$@"
 exit $?