| OLD | NEW |
| 1 #!/bin/sh | 1 #!/bin/sh |
| 2 | 2 |
| 3 if [ "$1" = "" ]; then | 3 if [ "$1" = "" ]; then |
| 4 key=../apps/server.pem | 4 key=../apps/server.pem |
| 5 else | 5 else |
| 6 key="$1" | 6 key="$1" |
| 7 fi | 7 fi |
| 8 if [ "$2" = "" ]; then | 8 if [ "$2" = "" ]; then |
| 9 cert=../apps/server.pem | 9 cert=../apps/server.pem |
| 10 else | 10 else |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 echo test sslv2/sslv3 with server authentication | 64 echo test sslv2/sslv3 with server authentication |
| 65 $ssltest -server_auth $CA $extra || exit 1 | 65 $ssltest -server_auth $CA $extra || exit 1 |
| 66 | 66 |
| 67 echo test sslv2/sslv3 with client authentication | 67 echo test sslv2/sslv3 with client authentication |
| 68 $ssltest -client_auth $CA $extra || exit 1 | 68 $ssltest -client_auth $CA $extra || exit 1 |
| 69 | 69 |
| 70 echo test sslv2/sslv3 with both client and server authentication | 70 echo test sslv2/sslv3 with both client and server authentication |
| 71 $ssltest -server_auth -client_auth $CA $extra || exit 1 | 71 $ssltest -server_auth -client_auth $CA $extra || exit 1 |
| 72 | 72 |
| 73 echo test sslv2/sslv3 with both client and server authentication and small clien
t buffers |
| 74 $ssltest -server_auth -client_auth -c_small_records $CA $extra || exit 1 |
| 75 |
| 76 echo test sslv2/sslv3 with both client and server authentication and small serve
r buffers |
| 77 $ssltest -server_auth -client_auth -s_small_records $CA $extra || exit 1 |
| 78 |
| 79 echo test sslv2/sslv3 with both client and server authentication and small clien
t and server buffers |
| 80 $ssltest -server_auth -client_auth -c_small_records -s_small_records $CA $extra
|| exit 1 |
| 81 |
| 73 echo test sslv2/sslv3 with both client and server authentication and handshake c
utthrough | 82 echo test sslv2/sslv3 with both client and server authentication and handshake c
utthrough |
| 74 $ssltest -server_auth -client_auth -cutthrough $CA $extra || exit 1 | 83 $ssltest -server_auth -client_auth -cutthrough $CA $extra || exit 1 |
| 75 | 84 |
| 76 echo test sslv2 via BIO pair | 85 echo test sslv2 via BIO pair |
| 77 $ssltest -bio_pair -ssl2 $extra || exit 1 | 86 $ssltest -bio_pair -ssl2 $extra || exit 1 |
| 78 | 87 |
| 79 echo test sslv2 with server authentication via BIO pair | 88 echo test sslv2 with server authentication via BIO pair |
| 80 $ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1 | 89 $ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1 |
| 81 | 90 |
| 82 if [ $dsa_cert = NO ]; then | 91 if [ $dsa_cert = NO ]; then |
| (...skipping 13 matching lines...) Expand all Loading... |
| 96 echo test sslv3 with client authentication via BIO pair | 105 echo test sslv3 with client authentication via BIO pair |
| 97 $ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1 | 106 $ssltest -bio_pair -ssl3 -client_auth $CA $extra || exit 1 |
| 98 | 107 |
| 99 echo test sslv3 with both client and server authentication via BIO pair | 108 echo test sslv3 with both client and server authentication via BIO pair |
| 100 $ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1 | 109 $ssltest -bio_pair -ssl3 -server_auth -client_auth $CA $extra || exit 1 |
| 101 | 110 |
| 102 echo test sslv2/sslv3 via BIO pair | 111 echo test sslv2/sslv3 via BIO pair |
| 103 $ssltest $extra || exit 1 | 112 $ssltest $extra || exit 1 |
| 104 | 113 |
| 105 if [ $dsa_cert = NO ]; then | 114 if [ $dsa_cert = NO ]; then |
| 106 echo test sslv2/sslv3 w/o DHE via BIO pair | 115 echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair' |
| 107 $ssltest -bio_pair -no_dhe $extra || exit 1 | 116 $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1 |
| 108 fi | 117 fi |
| 109 | 118 |
| 110 echo test sslv2/sslv3 with 1024bit DHE via BIO pair | 119 echo test sslv2/sslv3 with 1024bit DHE via BIO pair |
| 111 $ssltest -bio_pair -dhe1024dsa -v $extra || exit 1 | 120 $ssltest -bio_pair -dhe1024dsa -v $extra || exit 1 |
| 112 | 121 |
| 113 echo test sslv2/sslv3 with server authentication | 122 echo test sslv2/sslv3 with server authentication |
| 114 $ssltest -bio_pair -server_auth $CA $extra || exit 1 | 123 $ssltest -bio_pair -server_auth $CA $extra || exit 1 |
| 115 | 124 |
| 116 echo test sslv2/sslv3 with client authentication via BIO pair | 125 echo test sslv2/sslv3 with client authentication via BIO pair |
| 117 $ssltest -bio_pair -client_auth $CA $extra || exit 1 | 126 $ssltest -bio_pair -client_auth $CA $extra || exit 1 |
| 118 | 127 |
| 119 echo test sslv2/sslv3 with both client and server authentication via BIO pair | 128 echo test sslv2/sslv3 with both client and server authentication via BIO pair |
| 120 $ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1 | 129 $ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1 |
| 121 | 130 |
| 122 echo test sslv2/sslv3 with both client and server authentication via BIO pair an
d app verify | 131 echo test sslv2/sslv3 with both client and server authentication via BIO pair an
d app verify |
| 123 $ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1 | 132 $ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1 |
| 124 | 133 |
| 125 ############################################################################# | 134 ############################################################################# |
| 126 | 135 |
| 127 if ../util/shlib_wrap.sh ../apps/openssl no-dh; then | 136 if ../util/shlib_wrap.sh ../apps/openssl no-dh; then |
| 128 echo skipping anonymous DH tests | 137 echo skipping anonymous DH tests |
| 129 else | 138 else |
| 130 echo test tls1 with 1024bit anonymous DH, multiple handshakes | 139 echo test tls1 with 1024bit anonymous DH, multiple handshakes |
| 131 $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra ||
exit 1 | 140 $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra ||
exit 1 |
| 132 fi | 141 fi |
| 133 | 142 |
| 134 if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then | 143 if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then |
| 135 echo skipping RSA tests | 144 echo skipping RSA tests |
| 136 else | 145 else |
| 137 echo test tls1 with 1024bit RSA, no DHE, multiple handshakes | 146 echo 'test tls1 with 1024bit RSA, no (EC)DHE, multiple handshakes' |
| 138 ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -
no_dhe -num 10 -f -time $extra || exit 1 | 147 ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -
no_dhe -no_ecdhe -num 10 -f -time $extra || exit 1 |
| 139 | 148 |
| 140 if ../util/shlib_wrap.sh ../apps/openssl no-dh; then | 149 if ../util/shlib_wrap.sh ../apps/openssl no-dh; then |
| 141 echo skipping RSA+DHE tests | 150 echo skipping RSA+DHE tests |
| 142 else | 151 else |
| 143 echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes | 152 echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes |
| 144 ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem
-dhe1024dsa -num 10 -f -time $extra || exit 1 | 153 ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem
-dhe1024dsa -num 10 -f -time $extra || exit 1 |
| 145 fi | 154 fi |
| 146 fi | 155 fi |
| 147 | 156 |
| 157 echo test tls1 with PSK |
| 158 $ssltest -tls1 -cipher PSK -psk abc123 $extra || exit 1 |
| 159 |
| 160 echo test tls1 with PSK via BIO pair |
| 161 $ssltest -bio_pair -tls1 -cipher PSK -psk abc123 $extra || exit 1 |
| 162 |
| 148 exit 0 | 163 exit 0 |
| OLD | NEW |