diff options
Diffstat (limited to 'tests/ocsp-tests/ocsp-tls-connection')
| -rwxr-xr-x | tests/ocsp-tests/ocsp-tls-connection | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/ocsp-tests/ocsp-tls-connection b/tests/ocsp-tests/ocsp-tls-connection index 1a0ec35b9d..5431a3e670 100755 --- a/tests/ocsp-tests/ocsp-tls-connection +++ b/tests/ocsp-tests/ocsp-tls-connection @@ -24,9 +24,8 @@ : ${srcdir=.} : ${CERTTOOL=../src/certtool${EXEEXT}} : ${OCSPTOOL=../src/ocsptool${EXEEXT}} -GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -unset SERV -: ${GNUTLS_CLI=../src/gnutls-cli${EXEEXT}} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} : ${DIFF=diff} TEMPLATE_FILE="out.$$.tmpl.tmp" SERVER_CERT_FILE="cert.$$.pem.tmp" @@ -39,11 +38,11 @@ if ! test -x "${OCSPTOOL}"; then exit 77 fi -if ! test -x "${GNUTLS_SERV}"; then +if ! test -x "${SERV}"; then exit 77 fi -if ! test -x "${GNUTLS_CLI}"; then +if ! test -x "${CLI}"; then exit 77 fi @@ -152,7 +151,7 @@ echo "=== Test 1: Server with valid certificate ===" PORT=${TLS_SERVER_PORT} launch_bare_server \ datefudge "${TESTDATE}" \ - "${GNUTLS_SERV}" --echo --disable-client-cert \ + "${SERV}" --echo --disable-client-cert \ --x509keyfile="${srcdir}/ocsp-tests/certs/server_good.key" \ --x509certfile="${SERVER_CERT_FILE}" \ --port="${TLS_SERVER_PORT}" @@ -163,7 +162,7 @@ wait_for_port "${TLS_SERVER_PORT}" echo "test 123456" | \ datefudge -s "${TESTDATE}" \ - "${GNUTLS_CLI}" --ocsp --x509cafile="${srcdir}/ocsp-tests/certs/ca.pem" \ + "${CLI}" --ocsp --x509cafile="${srcdir}/ocsp-tests/certs/ca.pem" \ --port="${TLS_SERVER_PORT}" localhost rc=$? @@ -197,7 +196,7 @@ TLS_SERVER_PORT=$PORT launch_bare_server \ datefudge "${TESTDATE}" \ - "${GNUTLS_SERV}" --echo --disable-client-cert \ + "${SERV}" --echo --disable-client-cert \ --x509keyfile="${srcdir}/ocsp-tests/certs/server_bad.key" \ --x509certfile="${SERVER_CERT_FILE}" \ --port="${TLS_SERVER_PORT}" @@ -207,7 +206,7 @@ wait_for_port "${TLS_SERVER_PORT}" echo "test 123456" | \ datefudge -s "${TESTDATE}" \ - "${GNUTLS_CLI}" --ocsp --x509cafile="${srcdir}/ocsp-tests/certs/ca.pem" \ + "${CLI}" --ocsp --x509cafile="${srcdir}/ocsp-tests/certs/ca.pem" \ --port="${TLS_SERVER_PORT}" localhost rc=$? |