From 7ea9f90d7734f07b5efd9a201e6e3254ce6a920b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 28 May 2015 21:48:17 +0200 Subject: [PATCH] Remove OPENSSL_CONF=/dev/null from tests Almost two months ago, the warning about non-existing config file was supressed by setting the environment variable OPENSSL_CONF to /dev/null everywhere. Now that this warning is gone, that practice is no longer needed. Reviewed-by: Stephen Henson Reviewed-by: Rich Salz --- test/Makefile | 8 ++++---- test/tcrl | 1 - test/testca | 2 +- test/testenc | 1 - test/testgen | 1 - test/testss | 1 - test/testssl | 1 - test/tkey | 1 - test/tocsp | 1 - test/tpkcs7 | 1 - test/tpkcs7d | 1 - test/treq | 1 - test/tsid | 1 - test/tx509 | 1 - 14 files changed, 5 insertions(+), 17 deletions(-) diff --git a/test/Makefile b/test/Makefile index 99b999a7ad..d37e0208de 100644 --- a/test/Makefile +++ b/test/Makefile @@ -300,7 +300,7 @@ test_ecdh: $(ECDHTEST)$(EXE_EXT) test_verify: ../apps/openssl$(EXE_EXT) @echo $(START) $@ -- expect some failures and expired certificates - OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem + ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem test_dh: $(DHTEST)$(EXE_EXT) @echo $(START) $@ @@ -345,7 +345,7 @@ test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \ @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf - @if OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ + @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ echo SKIP $@ -- requires RSA; \ else \ echo $(START) $@; \ @@ -353,7 +353,7 @@ test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf fi test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh - @if OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ + @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ echo SKIP $@ -- requires RSA; \ else \ echo $(START) $@; \ @@ -370,7 +370,7 @@ test_jpake: $(JPAKETEST)$(EXE_EXT) test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt @echo $(START) $@ - OPENSSL_CONFIG=/dev/null $(PERL) cms-test.pl + $(PERL) cms-test.pl test_srp: $(SRPTEST)$(EXE_EXT) @echo $(START) $@ diff --git a/test/tcrl b/test/tcrl index f01eff870b..951c9ddc11 100644 --- a/test/tcrl +++ b/test/tcrl @@ -1,6 +1,5 @@ #!/bin/sh -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF cmd='../util/shlib_wrap.sh ../apps/openssl crl' if [ "$1"x != "x" ]; then diff --git a/test/testca b/test/testca index ee5246303d..452558bfc6 100644 --- a/test/testca +++ b/test/testca @@ -18,7 +18,7 @@ export SSLEAY_CONFIG OPENSSL SSLEAY_CONFIG="-config CAss.cnf" OPENSSL="`pwd`/../util/opensslwrap.sh" -OPENSSL_CONFIG=/dev/null $PERL ../apps/CA.pl -newca $test; diff --git a/test/testgen b/test/testgen index f4eb112232..1140f8ac96 100644 --- a/test/testgen +++ b/test/testgen @@ -3,7 +3,6 @@ T=testcert KEY=512 CA=../certs/testca.pem -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF /bin/rm -f $T.1 $T.2 $T.key diff --git a/test/testss b/test/testss index 0f2f6dd546..5c5389b462 100644 --- a/test/testss +++ b/test/testss @@ -5,7 +5,6 @@ reqcmd="../util/shlib_wrap.sh ../apps/openssl req" x509cmd="../util/shlib_wrap.sh ../apps/openssl x509 $digest" verifycmd="../util/shlib_wrap.sh ../apps/openssl verify" dummycnf="../apps/openssl.cnf" -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF CAkey="keyCA.ss" CAcert="certCA.ss" diff --git a/test/testssl b/test/testssl index 0f5db08b5f..7e834a7a36 100644 --- a/test/testssl +++ b/test/testssl @@ -10,7 +10,6 @@ if [ "$2" = "" ]; then else cert="$2" fi -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF ssltest="../util/shlib_wrap.sh ./ssltest -key $key -cert $cert -c_key $key -c_cert $cert" if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then diff --git a/test/tkey b/test/tkey index c6abd2f3ea..47ac1be8fc 100644 --- a/test/tkey +++ b/test/tkey @@ -4,7 +4,6 @@ t=$1 ktype=$2 ptype=$3 -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF if ../util/shlib_wrap.sh ../apps/openssl no-$ktype; then echo skipping $ktype $ptype conversion test exit 0 diff --git a/test/tocsp b/test/tocsp index ac9114515b..5fc291ca6e 100644 --- a/test/tocsp +++ b/test/tocsp @@ -1,7 +1,6 @@ #!/bin/sh cmd='../util/shlib_wrap.sh ../apps/openssl' -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF ocspdir="ocsp-tests" # 17 December 2012 so we don't get certificate expiry errors. check_time="-attime 1355875200" diff --git a/test/tpkcs7 b/test/tpkcs7 index a1e8c0a61b..91e304bb67 100644 --- a/test/tpkcs7 +++ b/test/tpkcs7 @@ -1,7 +1,6 @@ #!/bin/sh cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7' -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF if [ "$1"x != "x" ]; then t=$1 diff --git a/test/tpkcs7d b/test/tpkcs7d index 9dc2932a38..c5077da80f 100644 --- a/test/tpkcs7d +++ b/test/tpkcs7d @@ -1,7 +1,6 @@ #!/bin/sh cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7' -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF if [ "$1"x != "x" ]; then t=$1 diff --git a/test/treq b/test/treq index 89f088c757..2062d76fb9 100644 --- a/test/treq +++ b/test/treq @@ -1,7 +1,6 @@ #!/bin/sh cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf' -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF if [ "$1"x != "x" ]; then t=$1 diff --git a/test/tsid b/test/tsid index a5c1c736da..546efb732a 100644 --- a/test/tsid +++ b/test/tsid @@ -1,6 +1,5 @@ #!/bin/sh -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF cmd='../util/shlib_wrap.sh ../apps/openssl sess_id' if [ "$1"x != "x" ]; then diff --git a/test/tx509 b/test/tx509 index f4774c0c99..3185ce11cd 100644 --- a/test/tx509 +++ b/test/tx509 @@ -1,6 +1,5 @@ #!/bin/sh -OPENSSL_CONF=/dev/null ; export OPENSSL_CONF cmd='../util/shlib_wrap.sh ../apps/openssl x509' if [ "$1"x != "x" ]; then -- 2.25.1