projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the file openssl.pc that I forgot a while ago.
[openssl.git]
/
test
/
testssl
diff --git
a/test/testssl
b/test/testssl
index 2151a6438cdab64341bb30711efe7b2c79df98ae..ba5e41c8613872e59ad529246585df2880cdab95 100644
(file)
--- a/
test/testssl
+++ b/
test/testssl
@@
-24,105
+24,114
@@
else
CA="-CAfile $3"
fi
CA="-CAfile $3"
fi
+if [ "$4" = "" ]; then
+ extra=""
+else
+ extra="$4"
+fi
+
#############################################################################
echo test sslv2
#############################################################################
echo test sslv2
-$ssltest -ssl2 || exit 1
+$ssltest -ssl2
$extra
|| exit 1
echo test sslv2 with server authentication
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
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
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
fi
echo test sslv3
-$ssltest -ssl3 || exit 1
+$ssltest -ssl3
$extra
|| exit 1
echo test sslv3 with server authentication
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
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
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
echo test sslv2/sslv3
-$ssltest || exit 1
+$ssltest
$extra
|| exit 1
echo test sslv2/sslv3 with server authentication
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 sslv2/sslv3 with both client and server authentication via BIO pair and app verify
+$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
#############################################################################
echo test tls1 with 1024bit anonymous DH, multiple handshakes
#############################################################################
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
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
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
fi
exit 0