diff options
| author | bcook <> | 2014-12-03 22:33:35 +0000 |
|---|---|---|
| committer | bcook <> | 2014-12-03 22:33:35 +0000 |
| commit | c5f4ab63c45e7eb0168d242f24e861bbbf294f6b (patch) | |
| tree | e612a7fe31f0738d06d2ebd3dce3f7109aa330c8 | |
| parent | 8ef61d3ec1c1e78bae48209c6ae8e7c7d103bdea (diff) | |
| download | openbsd-c5f4ab63c45e7eb0168d242f24e861bbbf294f6b.tar.gz openbsd-c5f4ab63c45e7eb0168d242f24e861bbbf294f6b.tar.bz2 openbsd-c5f4ab63c45e7eb0168d242f24e861bbbf294f6b.zip | |
Allow overriding the path to the testssl and openssl binaries.
This is needed by the portable tree to point directly to the newly-built
binaries when running unit tests.
discussed with jsing@ and others
| -rw-r--r-- | src/regress/lib/libssl/ssl/testssl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/regress/lib/libssl/ssl/testssl b/src/regress/lib/libssl/ssl/testssl index ca974a68c9..ff63ce1e44 100644 --- a/src/regress/lib/libssl/ssl/testssl +++ b/src/regress/lib/libssl/ssl/testssl | |||
| @@ -3,11 +3,11 @@ | |||
| 3 | key="$1" | 3 | key="$1" |
| 4 | cert="$2" | 4 | cert="$2" |
| 5 | CA="-CAfile $3" | 5 | CA="-CAfile $3" |
| 6 | extra="$4" | 6 | ssltest="${4-./ssltest} -key $key -cert $cert -c_key $key -c_cert $cert" |
| 7 | openssl=${5-openssl} | ||
| 8 | extra="$6" | ||
| 7 | 9 | ||
| 8 | ssltest="./ssltest -key $key -cert $cert -c_key $key -c_cert $cert" | 10 | if $openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then |
| 9 | |||
| 10 | if openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then | ||
| 11 | dsa_cert=YES | 11 | dsa_cert=YES |
| 12 | else | 12 | else |
| 13 | dsa_cert=NO | 13 | dsa_cert=NO |
| @@ -105,7 +105,7 @@ $ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1 | |||
| 105 | echo "Testing ciphersuites" | 105 | echo "Testing ciphersuites" |
| 106 | for protocol in TLSv1.2 SSLv3; do | 106 | for protocol in TLSv1.2 SSLv3; do |
| 107 | echo "Testing ciphersuites for $protocol" | 107 | echo "Testing ciphersuites for $protocol" |
| 108 | for cipher in `openssl ciphers "RSA+$protocol" | tr ':' ' '`; do | 108 | for cipher in `$openssl ciphers "RSA+$protocol" | tr ':' ' '`; do |
| 109 | echo "Testing $cipher" | 109 | echo "Testing $cipher" |
| 110 | prot="" | 110 | prot="" |
| 111 | if [ $protocol = "SSLv3" ] ; then | 111 | if [ $protocol = "SSLv3" ] ; then |
| @@ -121,20 +121,20 @@ done | |||
| 121 | 121 | ||
| 122 | ############################################################################# | 122 | ############################################################################# |
| 123 | 123 | ||
| 124 | if openssl no-dh; then | 124 | if $openssl no-dh; then |
| 125 | echo skipping anonymous DH tests | 125 | echo skipping anonymous DH tests |
| 126 | else | 126 | else |
| 127 | echo test tls1 with 1024bit anonymous DH, multiple handshakes | 127 | echo test tls1 with 1024bit anonymous DH, multiple handshakes |
| 128 | $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1 | 128 | $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1 |
| 129 | fi | 129 | fi |
| 130 | 130 | ||
| 131 | #if openssl no-rsa; then | 131 | #if $openssl no-rsa; then |
| 132 | # echo skipping RSA tests | 132 | # echo skipping RSA tests |
| 133 | #else | 133 | #else |
| 134 | # echo 'test tls1 with 1024bit RSA, no (EC)DHE, multiple handshakes' | 134 | # echo 'test tls1 with 1024bit RSA, no (EC)DHE, multiple handshakes' |
| 135 | # ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -no_ecdhe -num 10 -f -time $extra || exit 1 | 135 | # ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -no_ecdhe -num 10 -f -time $extra || exit 1 |
| 136 | # | 136 | # |
| 137 | # if openssl no-dh; then | 137 | # if $openssl no-dh; then |
| 138 | # echo skipping RSA+DHE tests | 138 | # echo skipping RSA+DHE tests |
| 139 | # else | 139 | # else |
| 140 | # echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes | 140 | # echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes |
| @@ -161,7 +161,7 @@ $ssltest -dtls1 -server_auth -client_auth $CA $extra || exit 1 | |||
| 161 | echo "Testing DTLS ciphersuites" | 161 | echo "Testing DTLS ciphersuites" |
| 162 | for protocol in SSLv3; do | 162 | for protocol in SSLv3; do |
| 163 | echo "Testing ciphersuites for $protocol" | 163 | echo "Testing ciphersuites for $protocol" |
| 164 | for cipher in `openssl ciphers "RSA+$protocol" | tr ':' '\n' | | 164 | for cipher in `$openssl ciphers "RSA+$protocol" | tr ':' '\n' | |
| 165 | grep -v RC4`; do | 165 | grep -v RC4`; do |
| 166 | echo "Testing $cipher" | 166 | echo "Testing $cipher" |
| 167 | $ssltest -cipher $cipher -dtls1 | 167 | $ssltest -cipher $cipher -dtls1 |