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>

test/Makefile

diff --git a/test/Makefile b/test/Makefile
index 99b999a..d37e020 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -300,7 +300,7 @@
 
 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 @@
 	@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 @@
 	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_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) $@

test/tcrl

diff --git a/test/tcrl b/test/tcrl
index f01eff8..951c9dd 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

test/testca

diff --git a/test/testca b/test/testca
index ee52463..452558b 100644
--- a/test/testca
+++ b/test/testca
@@ -18,7 +18,7 @@
 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

test/testenc

diff --git a/test/testenc b/test/testenc
index 87b70ec..941a302 100644
--- 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;

test/testgen

diff --git a/test/testgen b/test/testgen
index f4eb112..1140f8a 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
 

test/testss

diff --git a/test/testss b/test/testss
index 0f2f6dd..5c5389b 100644
--- a/test/testss
+++ b/test/testss
@@ -5,7 +5,6 @@
 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"

test/testssl

diff --git a/test/testssl b/test/testssl
index 0f5db08..7e834a7 100644
--- a/test/testssl
+++ b/test/testssl
@@ -10,7 +10,6 @@
 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

test/tkey

diff --git a/test/tkey b/test/tkey
index c6abd2f..47ac1be 100644
--- a/test/tkey
+++ b/test/tkey
@@ -4,7 +4,6 @@
 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

test/tocsp

diff --git a/test/tocsp b/test/tocsp
index ac91145..5fc291c 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"

test/tpkcs7

diff --git a/test/tpkcs7 b/test/tpkcs7
index a1e8c0a..91e304b 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

test/tpkcs7d

diff --git a/test/tpkcs7d b/test/tpkcs7d
index 9dc2932..c5077da 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

test/treq

diff --git a/test/treq b/test/treq
index 89f088c..2062d76 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

test/tsid

diff --git a/test/tsid b/test/tsid
index a5c1c73..546efb7 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

test/tx509

diff --git a/test/tx509 b/test/tx509
index f4774c0..3185ce1 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