Commit 7ea9f90d authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 296f54ee

test/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -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) $@

test/tcrl

+0 −1
Original line number Diff line number Diff line 
#!/bin/sh



OPENSSL_CONF=/dev/null ; export OPENSSL_CONF

cmd='../util/shlib_wrap.sh ../apps/openssl crl'



if [ "$1"x != "x" ]; then

test/testca

+1 −1
Original line number Diff line number Diff line
@@ -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

test/testenc

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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