diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-01-05 23:01:40 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-01-05 23:01:40 +0000 |
| commit | a92139156a50b00800436436ed28ad6ac0baa54b (patch) | |
| tree | e2fbe38500bbd892d64b5cd2b0be5100fcc6dae0 /lib/libssl/test/testssl | |
| parent | 37f42acd42691d60502b271f1f0c823dcd37f59f (diff) | |
OpenSSL 1.0.0f: merge
Diffstat (limited to 'lib/libssl/test/testssl')
| -rw-r--r-- | lib/libssl/test/testssl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/test/testssl b/lib/libssl/test/testssl index f9d7c5d65ff..b55364ae888 100644 --- a/lib/libssl/test/testssl +++ b/lib/libssl/test/testssl @@ -100,8 +100,8 @@ echo test sslv2/sslv3 via BIO pair $ssltest $extra || exit 1 if [ $dsa_cert = NO ]; then - echo test sslv2/sslv3 w/o DHE via BIO pair - $ssltest -bio_pair -no_dhe $extra || exit 1 + echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair' + $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1 fi 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 echo skipping RSA tests else - echo test tls1 with 1024bit RSA, no 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 + 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 -no_ecdhe -num 10 -f -time $extra || exit 1 if ../util/shlib_wrap.sh ../apps/openssl no-dh; then echo skipping RSA+DHE tests |