generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove OPENSSL_CONF=/dev/null from tests

Browse Source 
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>
This commit is contained in:
Richard Levitte 2015-05-28 21:48:17 +02:00
parent 296f54ee21
commit 7ea9f90d77
14 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/Makefile
View File

@ -300,7 +300,7 @@ test_ecdh: $(ECDHTEST)$(EXE_EXT)
test_verify: ../apps/openssl$(EXE_EXT) test_verify: ../apps/openssl$(EXE_EXT)
@echo $(START) $@ -- expect some failures and expired certificates @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) test_dh: $(DHTEST)$(EXE_EXT)
@echo $(START) $@ @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 @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf 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; \ echo SKIP $@ -- requires RSA; \
else \ else \
echo $(START) $@; \ echo $(START) $@; \
@ -353,7 +353,7 @@ test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
fi fi
test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh 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; \ echo SKIP $@ -- requires RSA; \
else \ else \
echo $(START) $@; \ echo $(START) $@; \
@ -370,7 +370,7 @@ test_jpake: $(JPAKETEST)$(EXE_EXT)
test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
@echo $(START) $@ @echo $(START) $@
OPENSSL_CONFIG=/dev/null $(PERL) cms-test.pl $(PERL) cms-test.pl
test_srp: $(SRPTEST)$(EXE_EXT) test_srp: $(SRPTEST)$(EXE_EXT)
@echo $(START) $@ @echo $(START) $@

1
test/tcrl
View File

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
cmd='../util/shlib_wrap.sh ../apps/openssl crl' cmd='../util/shlib_wrap.sh ../apps/openssl crl'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then

2
test/testca
View File

@ -18,7 +18,7 @@ export SSLEAY_CONFIG OPENSSL
SSLEAY_CONFIG="-config CAss.cnf" SSLEAY_CONFIG="-config CAss.cnf"
OPENSSL="`pwd`/../util/opensslwrap.sh" 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" SSLEAY_CONFIG="-config Uss.cnf"
$PERL ../apps/CA.pl -newreq $PERL ../apps/CA.pl -newreq

1
test/testenc
View File

@ -3,7 +3,6 @@
testsrc=testenc testsrc=testenc
test=./p test=./p
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
cmd="../util/shlib_wrap.sh ../apps/openssl" cmd="../util/shlib_wrap.sh ../apps/openssl"
cat $testsrc >$test; cat $testsrc >$test;

1
test/testgen
View File

@ -3,7 +3,6 @@
T=testcert T=testcert
KEY=512 KEY=512
CA=../certs/testca.pem CA=../certs/testca.pem
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
/bin/rm -f $T.1 $T.2 $T.key /bin/rm -f $T.1 $T.2 $T.key

1
test/testss
View File

@ -5,7 +5,6 @@ reqcmd="../util/shlib_wrap.sh ../apps/openssl req"
x509cmd="../util/shlib_wrap.sh ../apps/openssl x509 $digest" x509cmd="../util/shlib_wrap.sh ../apps/openssl x509 $digest"
verifycmd="../util/shlib_wrap.sh ../apps/openssl verify" verifycmd="../util/shlib_wrap.sh ../apps/openssl verify"
dummycnf="../apps/openssl.cnf" dummycnf="../apps/openssl.cnf"
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
CAkey="keyCA.ss" CAkey="keyCA.ss"
CAcert="certCA.ss" CAcert="certCA.ss"

1
test/testssl
View File

@ -10,7 +10,6 @@ if [ "$2" = "" ]; then
else else
cert="$2" cert="$2"
fi fi
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
ssltest="../util/shlib_wrap.sh ./ssltest -key $key -cert $cert -c_key $key -c_cert $cert" 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 if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then

1
test/tkey
View File

@ -4,7 +4,6 @@ t=$1
ktype=$2 ktype=$2
ptype=$3 ptype=$3
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
if ../util/shlib_wrap.sh ../apps/openssl no-$ktype; then if ../util/shlib_wrap.sh ../apps/openssl no-$ktype; then
echo skipping $ktype $ptype conversion test echo skipping $ktype $ptype conversion test
exit 0 exit 0

1
test/tocsp
View File

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
cmd='../util/shlib_wrap.sh ../apps/openssl' cmd='../util/shlib_wrap.sh ../apps/openssl'
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
ocspdir="ocsp-tests" ocspdir="ocsp-tests"
# 17 December 2012 so we don't get certificate expiry errors. # 17 December 2012 so we don't get certificate expiry errors.
check_time="-attime 1355875200" check_time="-attime 1355875200"

1
test/tpkcs7
View File

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7' cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1

1
test/tpkcs7d
View File

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7' cmd='../util/shlib_wrap.sh ../apps/openssl pkcs7'
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1

1
test/treq
View File

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf' cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf'
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then
t=$1 t=$1

1
test/tsid
View File

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
cmd='../util/shlib_wrap.sh ../apps/openssl sess_id' cmd='../util/shlib_wrap.sh ../apps/openssl sess_id'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then

1
test/tx509
View File

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
cmd='../util/shlib_wrap.sh ../apps/openssl x509' cmd='../util/shlib_wrap.sh ../apps/openssl x509'
if [ "$1"x != "x" ]; then if [ "$1"x != "x" ]; then