diff options
Diffstat (limited to 'tests/cert-tests')
71 files changed, 216 insertions, 216 deletions
diff --git a/tests/cert-tests/aki b/tests/cert-tests/aki index e8d39588e3..b7bbe91c1c 100755 --- a/tests/cert-tests/aki +++ b/tests/cert-tests/aki @@ -22,10 +22,10 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=aki-$$.tmp -DIFF="${DIFF:-diff -b -B}" +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/alt-chain b/tests/cert-tests/alt-chain index a2261b3809..d72bfa41d6 100755 --- a/tests/cert-tests/alt-chain +++ b/tests/cert-tests/alt-chain @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-critical b/tests/cert-tests/cert-critical index f923b29fa4..5734c3fe00 100755 --- a/tests/cert-tests/cert-critical +++ b/tests/cert-tests/cert-critical @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-non-digits-time b/tests/cert-tests/cert-non-digits-time index 9c25c396de..1c72a9c675 100755 --- a/tests/cert-tests/cert-non-digits-time +++ b/tests/cert-tests/cert-non-digits-time @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-sanity b/tests/cert-tests/cert-sanity index 4bf0a0cf85..c2d63d966c 100755 --- a/tests/cert-tests/cert-sanity +++ b/tests/cert-tests/cert-sanity @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-time b/tests/cert-tests/cert-time index 6ee2a226e6..3310250289 100755 --- a/tests/cert-tests/cert-time +++ b/tests/cert-tests/cert-time @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/certtool b/tests/cert-tests/certtool index 0fd29beea9..11b8b8f636 100755 --- a/tests/cert-tests/certtool +++ b/tests/cert-tests/certtool @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE1=certtool-file1.$$.tmp TMPFILE2=certtool-file2.$$.tmp PASS="1234" @@ -39,8 +39,8 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -SETSID=$(which setsid) -if test -n "${SETSID}";then +: ${SETSID=setsid} +if ("$SETSID" --version) >/dev/null 2>&1; then ${VALGRIND} "${CERTTOOL}" --generate-privkey --rsa --outfile ${TMPFILE1} --pkcs8 --password ${PASS} if test $? != 0;then echo "private key generation failed" diff --git a/tests/cert-tests/certtool-crl-decoding b/tests/cert-tests/certtool-crl-decoding index dadc92cbf7..7480150ba1 100755 --- a/tests/cert-tests/certtool-crl-decoding +++ b/tests/cert-tests/certtool-crl-decoding @@ -22,8 +22,8 @@ # This checks whether OIDs > 2^32 are correctly decoded. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} OUTFILE="crl.$$.pem" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/certtool-ecdsa b/tests/cert-tests/certtool-ecdsa index 9811777b1f..885efe243f 100755 --- a/tests/cert-tests/certtool-ecdsa +++ b/tests/cert-tests/certtool-ecdsa @@ -20,8 +20,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} KEYFILE=ecdsa-privkey.$$.tmp TMPFILE=ecdsa.$$.tmp diff --git a/tests/cert-tests/certtool-eddsa b/tests/cert-tests/certtool-eddsa index 7e07822507..2fc027a95b 100755 --- a/tests/cert-tests/certtool-eddsa +++ b/tests/cert-tests/certtool-eddsa @@ -20,8 +20,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} KEYFILE=eddsa-privkey.$$.tmp TMPFILE=eddsa.$$.tmp TMPFILE2=eddsa2.$$.tmp diff --git a/tests/cert-tests/certtool-long-cn b/tests/cert-tests/certtool-long-cn index 41e7a9740c..9614bdf59a 100755 --- a/tests/cert-tests/certtool-long-cn +++ b/tests/cert-tests/certtool-long-cn @@ -22,9 +22,9 @@ # This checks whether invalid UTF8 strings trigger valgrind warnings. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} outfile="out.$$.pem" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/certtool-long-oids b/tests/cert-tests/certtool-long-oids index 17e1a40d53..7aa0cc965a 100755 --- a/tests/cert-tests/certtool-long-oids +++ b/tests/cert-tests/certtool-long-oids @@ -22,9 +22,9 @@ # This checks whether OIDs > 2^32 are correctly decoded. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} OUTFILE="long-oids.$$.pem.tmp" TMPFILE1="long-oids1.$$.pem.tmp" diff --git a/tests/cert-tests/certtool-rsa-pss b/tests/cert-tests/certtool-rsa-pss index 654bf34869..598351d41d 100755 --- a/tests/cert-tests/certtool-rsa-pss +++ b/tests/cert-tests/certtool-rsa-pss @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} OUTFILE=cert-pss-privkey.$$.tmp TMPFILE=cert-pss.$$.tmp TMPFILE2=cert2-pss.$$.tmp diff --git a/tests/cert-tests/certtool-subca b/tests/cert-tests/certtool-subca index 6bd5d94def..478d1f0d0b 100755 --- a/tests/cert-tests/certtool-subca +++ b/tests/cert-tests/certtool-subca @@ -24,9 +24,9 @@ # This is a reproducer for #767 -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/certtool-utf8 b/tests/cert-tests/certtool-utf8 index a814c08e12..b37b305f90 100755 --- a/tests/cert-tests/certtool-utf8 +++ b/tests/cert-tests/certtool-utf8 @@ -22,9 +22,9 @@ # This checks whether invalid UTF8 strings trigger valgrind warnings. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" diff --git a/tests/cert-tests/certtool-verify-profiles b/tests/cert-tests/certtool-verify-profiles index a4d738627e..f63ee923fe 100755 --- a/tests/cert-tests/certtool-verify-profiles +++ b/tests/cert-tests/certtool-verify-profiles @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/crl b/tests/cert-tests/crl index f4f97d757b..56ed5e5847 100755 --- a/tests/cert-tests/crl +++ b/tests/cert-tests/crl @@ -22,10 +22,10 @@ export TZ="UTC" -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" -ac_cv_sizeof_time_t="${ac_cv_sizeof_time_t:-8}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} +: ${ac_cv_sizeof_time_t=8} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/crq b/tests/cert-tests/crq index 1d64dee27e..60b161f6d8 100755 --- a/tests/cert-tests/crq +++ b/tests/cert-tests/crq @@ -22,9 +22,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/dane b/tests/cert-tests/dane index 66a1f30817..9398c73dcc 100755 --- a/tests/cert-tests/dane +++ b/tests/cert-tests/dane @@ -22,9 +22,9 @@ set -e -srcdir="${srcdir:-.}" -DANETOOL="${DANETOOL:-../../src/danetool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${DANETOOL=../../src/danetool${EXEEXT}} +: ${DIFF=diff} test -e "${DANETOOL}" || exit 77 diff --git a/tests/cert-tests/dsa b/tests/cert-tests/dsa index f8901c8c3e..e623a7483a 100755 --- a/tests/cert-tests/dsa +++ b/tests/cert-tests/dsa @@ -20,13 +20,13 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../../src/gnutls-serv}" -CLI="${CLI:-../../src/gnutls-cli}" +: ${srcdir=.} +: ${SERV=../../src/gnutls-serv${EXEEXT}} +: ${CLI=../../src/gnutls-cli${EXEEXT}} DEBUG="" unset RETCODE -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -59,7 +59,7 @@ echo "Checking various DSA key sizes (port ${PORT})" echo "Checking DSA-1024 with TLS 1.0" eval "${GETPORT}" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.1024.pem" --x509keyfile "${srcdir}/data/dsa.1024.pem" +launch_server --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.1024.pem" --x509keyfile "${srcdir}/data/dsa.1024.pem" PID=$! wait_server "${PID}" @@ -93,7 +93,7 @@ wait echo "Checking DSA-1024 with TLS 1.2" eval "${GETPORT}" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.1024.pem" --x509keyfile "${srcdir}/data/dsa.1024.pem" +launch_server --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.1024.pem" --x509keyfile "${srcdir}/data/dsa.1024.pem" PID=$! wait_server "${PID}" @@ -126,7 +126,7 @@ wait #echo "Checking DSA-2048 with TLS 1.0" #eval "${GETPORT}" -#launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/data/cert.dsa.2048.pem" --x509keyfile "${srcdir}/data/dsa.2048.pem" +#launch_server --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/data/cert.dsa.2048.pem" --x509keyfile "${srcdir}/data/dsa.2048.pem" #PID=$! #wait_server "${PID}" @@ -140,7 +140,7 @@ wait echo "Checking DSA-2048 with TLS 1.2" eval "${GETPORT}" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.2048.pem" --x509keyfile "${srcdir}/data/dsa.2048.pem" +launch_server --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.2048.pem" --x509keyfile "${srcdir}/data/dsa.2048.pem" PID=$! wait_server "${PID}" @@ -154,7 +154,7 @@ wait #echo "Checking DSA-3072 with TLS 1.0" -#launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/data/cert.dsa.3072.pem" --x509keyfile "${srcdir}/data/dsa.3072.pem" +#launch_server --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0" --x509certfile "${srcdir}/data/cert.dsa.3072.pem" --x509keyfile "${srcdir}/data/dsa.3072.pem" #PID=$! #wait_server "${PID}" # @@ -169,7 +169,7 @@ wait echo "Checking DSA-3072 with TLS 1.2" eval "${GETPORT}" -launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.3072.pem" --x509keyfile "${srcdir}/data/dsa.3072.pem" +launch_server --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/data/cert.dsa.3072.pem" --x509keyfile "${srcdir}/data/dsa.3072.pem" PID=$! wait_server "${PID}" diff --git a/tests/cert-tests/ecdsa b/tests/cert-tests/ecdsa index c593351b57..431b88f06e 100755 --- a/tests/cert-tests/ecdsa +++ b/tests/cert-tests/ecdsa @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=ecdsa.$$.tmp TMPCA=ecdsa-ca.$$.tmp TMPCAKEY=ecdsa-ca-key.$$.tmp diff --git a/tests/cert-tests/email b/tests/cert-tests/email index a00281028e..1629fec881 100755 --- a/tests/cert-tests/email +++ b/tests/cert-tests/email @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} DIFF=$"{DIFF:-diff}" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/gost b/tests/cert-tests/gost index ff47988a6d..c16c539814 100755 --- a/tests/cert-tests/gost +++ b/tests/cert-tests/gost @@ -21,8 +21,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=gost.$$.tmp TMPCA=gost-ca.$$.tmp TMPCAKEY=gost-ca-key.$$.tmp diff --git a/tests/cert-tests/illegal-rsa b/tests/cert-tests/illegal-rsa index 1b9a162779..d0cb611bc9 100755 --- a/tests/cert-tests/illegal-rsa +++ b/tests/cert-tests/illegal-rsa @@ -18,9 +18,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -GREP="${GREP:-grep}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${GREP=grep} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/inhibit-anypolicy b/tests/cert-tests/inhibit-anypolicy index ba5e1100f6..e27e4a85f7 100755 --- a/tests/cert-tests/inhibit-anypolicy +++ b/tests/cert-tests/inhibit-anypolicy @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/invalid-sig b/tests/cert-tests/invalid-sig index 58134a4d09..53ef76051b 100755 --- a/tests/cert-tests/invalid-sig +++ b/tests/cert-tests/invalid-sig @@ -22,9 +22,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi diff --git a/tests/cert-tests/key-id b/tests/cert-tests/key-id index 2e59593a3f..9c88035e87 100755 --- a/tests/cert-tests/key-id +++ b/tests/cert-tests/key-id @@ -22,8 +22,8 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=key-id.$$.tmp TEMPLFILE=tmpl.$$.tmp diff --git a/tests/cert-tests/key-invalid b/tests/cert-tests/key-invalid index eeb94ee976..975687fe7a 100755 --- a/tests/cert-tests/key-invalid +++ b/tests/cert-tests/key-invalid @@ -21,9 +21,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=key-invalid.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/krb5-test b/tests/cert-tests/krb5-test index a6e092cc90..caa7d542d0 100755 --- a/tests/cert-tests/krb5-test +++ b/tests/cert-tests/krb5-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=tmp-krb5name.pem TMPLFILE=tmp-krb5name.tmpl diff --git a/tests/cert-tests/md5-test b/tests/cert-tests/md5-test index 15d6280b1c..7438e091f5 100755 --- a/tests/cert-tests/md5-test +++ b/tests/cert-tests/md5-test @@ -21,9 +21,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=md5.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/name-constraints b/tests/cert-tests/name-constraints index 3b2370d49a..e0c1e7479d 100755 --- a/tests/cert-tests/name-constraints +++ b/tests/cert-tests/name-constraints @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/othername-test b/tests/cert-tests/othername-test index 00f93b22dd..40eb6c12bb 100755 --- a/tests/cert-tests/othername-test +++ b/tests/cert-tests/othername-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=tmp-othername.pem if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pathlen b/tests/cert-tests/pathlen index d532012295..b5cd7d7107 100755 --- a/tests/cert-tests/pathlen +++ b/tests/cert-tests/pathlen @@ -22,9 +22,9 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding index 267a1fc7f3..dc9380c74b 100755 --- a/tests/cert-tests/pem-decoding +++ b/tests/cert-tests/pem-decoding @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs1-pad b/tests/cert-tests/pkcs1-pad index c75ab9e09d..c8f34e4144 100755 --- a/tests/cert-tests/pkcs1-pad +++ b/tests/cert-tests/pkcs1-pad @@ -23,8 +23,8 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs12 b/tests/cert-tests/pkcs12 index f28230a7b2..a04b043c8e 100755 --- a/tests/cert-tests/pkcs12 +++ b/tests/cert-tests/pkcs12 @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -37,7 +37,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff}" +: ${DIFF=diff} DEBUG="" TMPFILE=pkcs12.$$.tmp diff --git a/tests/cert-tests/pkcs12-corner-cases b/tests/cert-tests/pkcs12-corner-cases index 0b9c482db7..2c6a2d9f2d 100755 --- a/tests/cert-tests/pkcs12-corner-cases +++ b/tests/cert-tests/pkcs12-corner-cases @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs12-encode b/tests/cert-tests/pkcs12-encode index 265c0df542..2f719f3044 100755 --- a/tests/cert-tests/pkcs12-encode +++ b/tests/cert-tests/pkcs12-encode @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -37,7 +37,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff -b -B}" +: ${DIFF=diff -b -B} DEBUG="" TMPFILE=pkcs12.$$.tmp diff --git a/tests/cert-tests/pkcs12-gost b/tests/cert-tests/pkcs12-gost index f7c4bba52b..ab94479ba7 100755 --- a/tests/cert-tests/pkcs12-gost +++ b/tests/cert-tests/pkcs12-gost @@ -22,8 +22,8 @@ # This test cannot run under windows because it passes UTF8 data on command # line. This seems not to work under windows. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -38,7 +38,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff}" +: ${DIFF=diff} DEBUG="" TMPFILE=pkcs12-gost.$$.tmp diff --git a/tests/cert-tests/pkcs12-utf8 b/tests/cert-tests/pkcs12-utf8 index ace10ca181..168e7c5126 100755 --- a/tests/cert-tests/pkcs12-utf8 +++ b/tests/cert-tests/pkcs12-utf8 @@ -25,8 +25,8 @@ # line. This seems not to work under windows. It intentionally depends on # bash as few other shells cannot handle utf8 strings -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -36,7 +36,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff}" +: ${DIFF=diff} DEBUG="" TMPFILE=pkcs12-utf8.$$.tmp diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7 index 5767e09646..709ee5c07f 100755 --- a/tests/cert-tests/pkcs7 +++ b/tests/cert-tests/pkcs7 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-broken-sigs b/tests/cert-tests/pkcs7-broken-sigs index b9351a055a..b51d0c5d15 100755 --- a/tests/cert-tests/pkcs7-broken-sigs +++ b/tests/cert-tests/pkcs7-broken-sigs @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-cat b/tests/cert-tests/pkcs7-cat index 6543397431..1cec37f4de 100755 --- a/tests/cert-tests/pkcs7-cat +++ b/tests/cert-tests/pkcs7-cat @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-constraints b/tests/cert-tests/pkcs7-constraints index 6964d26f09..150c103443 100755 --- a/tests/cert-tests/pkcs7-constraints +++ b/tests/cert-tests/pkcs7-constraints @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-constraints2 b/tests/cert-tests/pkcs7-constraints2 index 7d1816a33a..94f89a5e93 100755 --- a/tests/cert-tests/pkcs7-constraints2 +++ b/tests/cert-tests/pkcs7-constraints2 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-eddsa b/tests/cert-tests/pkcs7-eddsa index 6f235c512b..40179703bc 100755 --- a/tests/cert-tests/pkcs7-eddsa +++ b/tests/cert-tests/pkcs7-eddsa @@ -19,9 +19,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-list-sign b/tests/cert-tests/pkcs7-list-sign index 5ca04d8005..2cf168bea4 100755 --- a/tests/cert-tests/pkcs7-list-sign +++ b/tests/cert-tests/pkcs7-list-sign @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs8 b/tests/cert-tests/pkcs8 index d23aad94b4..8bad70193e 100755 --- a/tests/cert-tests/pkcs8 +++ b/tests/cert-tests/pkcs8 @@ -18,9 +18,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -GREP="${GREP:-grep}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${GREP=grep} TMPFILE=tmp-key-ca.$$.p8 diff --git a/tests/cert-tests/pkcs8-decode b/tests/cert-tests/pkcs8-decode index 2fb8696626..27c84bfaf3 100755 --- a/tests/cert-tests/pkcs8-decode +++ b/tests/cert-tests/pkcs8-decode @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-decode.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pkcs8-eddsa b/tests/cert-tests/pkcs8-eddsa index 7474078ff6..2d33ebfb50 100755 --- a/tests/cert-tests/pkcs8-eddsa +++ b/tests/cert-tests/pkcs8-eddsa @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-eddsa.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pkcs8-gost b/tests/cert-tests/pkcs8-gost index 325b47a581..6527d9d369 100755 --- a/tests/cert-tests/pkcs8-gost +++ b/tests/cert-tests/pkcs8-gost @@ -19,9 +19,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-gost-decode.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pkcs8-invalid b/tests/cert-tests/pkcs8-invalid index a9e8beac21..edf19bbeec 100755 --- a/tests/cert-tests/pkcs8-invalid +++ b/tests/cert-tests/pkcs8-invalid @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-invalid.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/privkey-import b/tests/cert-tests/privkey-import index 73bacae253..575ca58497 100755 --- a/tests/cert-tests/privkey-import +++ b/tests/cert-tests/privkey-import @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=tmp-$$.privkey.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-dh b/tests/cert-tests/provable-dh index 0676c0f5f0..50d51ce4b7 100755 --- a/tests/cert-tests/provable-dh +++ b/tests/cert-tests/provable-dh @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-dh$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-dh-default b/tests/cert-tests/provable-dh-default index 43c2ed5aff..f6fa889814 100755 --- a/tests/cert-tests/provable-dh-default +++ b/tests/cert-tests/provable-dh-default @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-dh$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey b/tests/cert-tests/provable-privkey index 51d4389eb7..0049c6d949 100755 --- a/tests/cert-tests/provable-privkey +++ b/tests/cert-tests/provable-privkey @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey-dsa2048 b/tests/cert-tests/provable-privkey-dsa2048 index f805ab3576..f7eee5daf1 100755 --- a/tests/cert-tests/provable-privkey-dsa2048 +++ b/tests/cert-tests/provable-privkey-dsa2048 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey-gen-default b/tests/cert-tests/provable-privkey-gen-default index 3edf3437d8..6517a242a5 100755 --- a/tests/cert-tests/provable-privkey-gen-default +++ b/tests/cert-tests/provable-privkey-gen-default @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey-rsa2048 b/tests/cert-tests/provable-privkey-rsa2048 index f846476e7e..7f6b4090cf 100755 --- a/tests/cert-tests/provable-privkey-rsa2048 +++ b/tests/cert-tests/provable-privkey-rsa2048 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/reject-invalid-time b/tests/cert-tests/reject-invalid-time index 39aa5c4ca5..27b3f3c758 100755 --- a/tests/cert-tests/reject-invalid-time +++ b/tests/cert-tests/reject-invalid-time @@ -19,10 +19,10 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${PKG_CONFIG=pkg-config} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 @@ -32,9 +32,9 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -${PKGCONFIG} --version >/dev/null || exit 77 +${PKG_CONFIG} --version >/dev/null || exit 77 -${PKGCONFIG} --atleast-version=4.12 libtasn1 || exit 77 +${PKG_CONFIG} --atleast-version=4.12 libtasn1 || exit 77 # Check whether certificates with invalid time fields are accepted for file in openssl-invalid-time-format.pem;do diff --git a/tests/cert-tests/rsa-pss-pad b/tests/cert-tests/rsa-pss-pad index 2c87c750fc..76b5a50742 100755 --- a/tests/cert-tests/rsa-pss-pad +++ b/tests/cert-tests/rsa-pss-pad @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=pss.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/sha2-dsa-test b/tests/cert-tests/sha2-dsa-test index 8632aefd31..f24195ce12 100755 --- a/tests/cert-tests/sha2-dsa-test +++ b/tests/cert-tests/sha2-dsa-test @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TEMPLFILE=template-dsa.$$.tmp CAFILE=ca-dsa.$$.tmp SUBCAFILE=subca-dsa.$$.tmp diff --git a/tests/cert-tests/sha2-test b/tests/cert-tests/sha2-test index eca12fdf7c..0c5ebd4cbc 100755 --- a/tests/cert-tests/sha2-test +++ b/tests/cert-tests/sha2-test @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TEMPLFILE=template.$$.tmp CAFILE=ca.$$.tmp SUBCAFILE=subca.$$.tmp diff --git a/tests/cert-tests/sha3-test b/tests/cert-tests/sha3-test index a4300672c3..386b20b63d 100755 --- a/tests/cert-tests/sha3-test +++ b/tests/cert-tests/sha3-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=sha3.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/smime b/tests/cert-tests/smime index f5e68401cf..5f6f8038e8 100755 --- a/tests/cert-tests/smime +++ b/tests/cert-tests/smime @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/template-exts-test b/tests/cert-tests/template-exts-test index 276ba2f798..379a9290e5 100755 --- a/tests/cert-tests/template-exts-test +++ b/tests/cert-tests/template-exts-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE="exts.$$.tmp" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test index 091021315b..b17942f2f8 100755 --- a/tests/cert-tests/template-test +++ b/tests/cert-tests/template-test @@ -20,10 +20,10 @@ #set -e -srcdir="${srcdir:-.}" -ac_cv_sizeof_time_t="${ac_cv_sizeof_time_t:-8}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${ac_cv_sizeof_time_t=8} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/tlsfeature-test b/tests/cert-tests/tlsfeature-test index fb26f6225b..4148a7b97c 100755 --- a/tests/cert-tests/tlsfeature-test +++ b/tests/cert-tests/tlsfeature-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=tlsfeature.$$.tmp TMPFILE2=tlsfeature-2.$$.tmp diff --git a/tests/cert-tests/tolerate-invalid-time b/tests/cert-tests/tolerate-invalid-time index 22d2a9199b..d5f89163f3 100755 --- a/tests/cert-tests/tolerate-invalid-time +++ b/tests/cert-tests/tolerate-invalid-time @@ -19,10 +19,10 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${PKG_CONFIG=pkg-config} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 @@ -32,9 +32,9 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -${PKGCONFIG} --version >/dev/null || exit 77 +${PKG_CONFIG} --version >/dev/null || exit 77 -${PKGCONFIG} --atleast-version=4.12 libtasn1 || exit 77 +${PKG_CONFIG} --atleast-version=4.12 libtasn1 || exit 77 # Check whether certificates with invalid time fields are accepted for file in openssl-invalid-time-format.pem;do diff --git a/tests/cert-tests/userid b/tests/cert-tests/userid index e3cdef1efa..39753c2753 100755 --- a/tests/cert-tests/userid +++ b/tests/cert-tests/userid @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/x509-duplicate-ext b/tests/cert-tests/x509-duplicate-ext index 534a534a69..0cfa7e1673 100755 --- a/tests/cert-tests/x509-duplicate-ext +++ b/tests/cert-tests/x509-duplicate-ext @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} OUTFILE=out.$$.tmp if ! test -x "${CERTTOOL}"; then |