use -no_ecdhe when using -no_dhe

This commit is contained in:
Bodo Möller 2011-10-13 15:05:50 +00:00
parent 49956294fc
commit d41bbd0db5

View File

@ -100,8 +100,8 @@ echo test sslv2/sslv3 via BIO pair
$ssltest $extra || exit 1 $ssltest $extra || exit 1
if [ $dsa_cert = NO ]; then if [ $dsa_cert = NO ]; then
echo test sslv2/sslv3 w/o DHE via BIO pair echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair'
$ssltest -bio_pair -no_dhe $extra || exit 1 $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1
fi fi
echo test sslv2/sslv3 with 1024bit DHE via BIO pair echo test sslv2/sslv3 with 1024bit DHE via BIO pair
@ -131,8 +131,8 @@ fi
if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
echo skipping RSA tests echo skipping RSA tests
else else
echo test tls1 with 1024bit RSA, no DHE, multiple handshakes echo 'test tls1 with 1024bit RSA, no (EC)DHE, multiple handshakes'
../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1 ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -no_ecdhe -num 10 -f -time $extra || exit 1
if ../util/shlib_wrap.sh ../apps/openssl no-dh; then if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
echo skipping RSA+DHE tests echo skipping RSA+DHE tests