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 <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/test/Makefile b/test/Makefile
index 99b999a7adfe13a83bc055617aaacd45e4aa6f37..d37e0208deaeef7d584478a72b19fcc97a0b4f12 100644 (file)
--- 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 f01eff870bc4a972235ffeb7792671d54fc623ed..951c9ddc11c0e5b923fe0b730725a065b0f308e2 100644 (file)
--- 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 ee5246303da9092fc296ed9b29d70ae810803025..452558bfc64b013716e8193595d352c5ac08b4b9 100644 (file)
--- 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 </dev/null
+$PERL ../apps/CA.pl -newca </dev/null
 
 SSLEAY_CONFIG="-config Uss.cnf"
 $PERL ../apps/CA.pl -newreq

diff --git a/test/testenc b/test/testenc
index 87b70ec111159189db8675b574135a9a1ea650c6..941a302ff7c843c10f4ed8117235c72cb9291978 100644 (file)
--- a/test/testenc
+++ b/test/testenc
@@ -3,7 +3,6 @@
 testsrc=testenc
 test=./p
 
-OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
 cmd="../util/shlib_wrap.sh ../apps/openssl"
 
 cat $testsrc >$test;

diff --git a/test/testgen b/test/testgen
index f4eb11223205ffedac9a95ffafeef13fdb87f15c..1140f8ac96358f5f6653ffd334ebbeaeff2b4d56 100644 (file)
--- 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 0f2f6dd5460fcdc2c23c204f83f6ab5125652ba4..5c5389b462a13d35028e2987c4c33325e34f164d 100644 (file)
--- 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 0f5db08b5fd5c68f99ee61a70ccef2c67d3c7106..7e834a7a36bbeca36dff84545ef4c4a77cb34dc5 100644 (file)
--- 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 c6abd2f3ea057e2182188571fb3c6adab0e1fa95..47ac1be8fca03c30867d9566388f9f580cb89361 100644 (file)
--- 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 ac9114515b3b920443a8cc4f3b3479a827f974a0..5fc291ca6eeb72a97eb9b274f7750b2dc2d2a279 100644 (file)
--- 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 a1e8c0a61b4234ca91ad4b5c65beafc7ee7391a2..91e304bb67dd98bfa812894caeb0a8935714d59b 100644 (file)
--- 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 9dc2932a389540bdae4f15e4059634ab3624fc70..c5077da80f0d325dc71d0f34cae3ed0767dd08a9 100644 (file)
--- 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 89f088c75797172e2d0c648d486e71363d50eff7..2062d76fb988592dbb44b750fe36431a835ae2dc 100644 (file)
--- 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 a5c1c736dafa921c7b5e06f48ad2b93359bd029c..546efb732a6f9abe5be2c298821337b9900de9f7 100644 (file)
--- 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 f4774c0c994063fb241e8bcd8bbc49c7cacc7ab8..3185ce11cd1a2bdd9b95e79240ed6e74f978afef 100644 (file)
--- 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