diff options
Diffstat (limited to 'test/testssl')
| -rw-r--r-- | test/testssl | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/test/testssl b/test/testssl index 2151a6438c..3ca5c8010b 100644 --- a/test/testssl +++ b/test/testssl @@ -24,105 +24,111 @@ else CA="-CAfile $3" fi +if [ "$4" = "" ]; then + extra="" +else + extra="$4" +fi + ############################################################################# echo test sslv2 -$ssltest -ssl2 || exit 1 +$ssltest -ssl2 $extra || exit 1 echo test sslv2 with server authentication -$ssltest -ssl2 -server_auth $CA || exit 1 +$ssltest -ssl2 -server_auth $CA $extra || exit 1 if [ $dsa_cert = NO ]; then echo test sslv2 with client authentication - $ssltest -ssl2 -client_auth $CA || exit 1 + $ssltest -ssl2 -client_auth $CA $extra || exit 1 echo test sslv2 with both client and server authentication - $ssltest -ssl2 -server_auth -client_auth $CA || exit 1 + $ssltest -ssl2 -server_auth -client_auth $CA $extra || exit 1 fi echo test sslv3 -$ssltest -ssl3 || exit 1 +$ssltest -ssl3 $extra || exit 1 echo test sslv3 with server authentication -$ssltest -ssl3 -server_auth $CA || exit 1 +$ssltest -ssl3 -server_auth $CA $extra || exit 1 echo test sslv3 with client authentication -$ssltest -ssl3 -client_auth $CA || exit 1 +$ssltest -ssl3 -client_auth $CA $extra || exit 1 echo test sslv3 with both client and server authentication -$ssltest -ssl3 -server_auth -client_auth $CA || exit 1 +$ssltest -ssl3 -server_auth -client_auth $CA $extra || exit 1 echo test sslv2/sslv3 -$ssltest || exit 1 +$ssltest $extra || exit 1 echo test sslv2/sslv3 with server authentication -$ssltest -server_auth $CA || exit 1 +$ssltest -server_auth $CA $extra || exit 1 echo test sslv2/sslv3 with client authentication -$ssltest -client_auth $CA || exit 1 +$ssltest -client_auth $CA $extra || exit 1 echo test sslv2/sslv3 with both client and server authentication -$ssltest -server_auth -client_auth $CA || exit 1 +$ssltest -server_auth -client_auth $CA $extra || exit 1 echo test sslv2 via BIO pair -$ssltest -bio_pair -ssl2 || exit 1 +$ssltest -bio_pair -ssl2 $extra || exit 1 echo test sslv2 with server authentication via BIO pair -$ssltest -bio_pair -ssl2 -server_auth $CA || exit 1 +$ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1 if [ $dsa_cert = NO ]; then echo test sslv2 with client authentication via BIO pair - $ssltest -bio_pair -ssl2 -client_auth $CA || exit 1 + $ssltest -bio_pair -ssl2 -client_auth $CA $extra || exit 1 echo test sslv2 with both client and server authentication via BIO pair - $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA || exit 1 + $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA $extra || exit 1 fi echo test sslv3 via BIO pair -$ssltest -bio_pair -ssl3 || exit 1 +$ssltest -bio_pair -ssl3 $extra || exit 1 echo test sslv3 with server authentication via BIO pair -$ssltest -bio_pair -ssl3 -server_auth $CA || exit 1 +$ssltest -bio_pair -ssl3 -server_auth $CA $extra || exit 1 echo test sslv3 with client authentication via BIO pair -$ssltest -bio_pair -ssl3 -client_auth $CA || exit 1 +$ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1 echo test sslv3 with both client and server authentication via BIO pair -$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA || exit 1 +$ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1 echo test sslv2/sslv3 via BIO pair -$ssltest || exit 1 +$ssltest $extra || exit 1 if [ $dsa_cert = NO ]; then echo test sslv2/sslv3 w/o DHE via BIO pair - $ssltest -bio_pair -no_dhe || exit 1 + $ssltest -bio_pair -no_dhe $extra || exit 1 fi echo test sslv2/sslv3 with 1024bit DHE via BIO pair -$ssltest -bio_pair -dhe1024dsa -v || exit 1 +$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1 echo test sslv2/sslv3 with server authentication -$ssltest -bio_pair -server_auth $CA || exit 1 +$ssltest -bio_pair -server_auth $CA $extra || exit 1 echo test sslv2/sslv3 with client authentication via BIO pair -$ssltest -bio_pair -client_auth $CA || exit 1 +$ssltest -bio_pair -client_auth $CA $extra || exit 1 echo test sslv2/sslv3 with both client and server authentication via BIO pair -$ssltest -bio_pair -server_auth -client_auth $CA || exit 1 +$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1 ############################################################################# echo test tls1 with 1024bit anonymous DH, multiple handshakes -$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time || exit 1 +$ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1 if ../apps/openssl no-rsa; then echo skipping RSA tests else echo test tls1 with 1024bit RSA, no DHE, multiple handshakes - ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time || exit 1 + ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1 echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes - ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time || exit 1 + ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1 fi exit 0 |