diff options
| author |   jsing <jsing@openbsd.org> | 2020-04-09 17:55:45 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-04-09 17:55:45 +0000 |
| commit | be86402ee4913eee82cca41f44b3baac06d213bb (patch) | |
| tree | be042ff1ad927a9251e13ace17dc8c9af6431318 | |
| parent | Include TLSv1.3 cipher suites unless cipher string references TLSv1.3. (diff) | |
| download | wireguard-openbsd-be86402ee4913eee82cca41f44b3baac06d213bb.tar.xz wireguard-openbsd-be86402ee4913eee82cca41f44b3baac06d213bb.zip | |
Revise test to handle the fact that TLSv1.3 cipher suites are now being
included in the output from `openssl ciphers`.
| -rw-r--r-- | regress/lib/libssl/ssl/testssl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/regress/lib/libssl/ssl/testssl b/regress/lib/libssl/ssl/testssl index 428870bb431..a785e9c8ed4 100644 --- a/regress/lib/libssl/ssl/testssl +++ b/regress/lib/libssl/ssl/testssl @@ -55,7 +55,8 @@ $ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1 echo "Testing ciphersuites" for protocol in SSLv3 TLSv1.2; do echo "Testing ciphersuites for $protocol" - for cipher in `$openssl ciphers "$protocol+aRSA" | tr ':' ' '`; do + for cipher in `$openssl ciphers -v "$protocol+aRSA" | + awk "/ $protocol / { print \\$1 }"`; do echo "Testing $cipher" $ssltest -cipher $cipher if [ $? -ne 0 ] ; then @@ -107,7 +108,8 @@ $ssltest -dtls1 -server_auth -client_auth $CA $extra || exit 1 echo "Testing DTLS ciphersuites" for protocol in SSLv3; do echo "Testing ciphersuites for $protocol" - for cipher in `$openssl ciphers "RSA+$protocol" | tr ':' '\n' | + for cipher in `$openssl ciphers -v "RSA+$protocol" | + awk "/ $protocol / { print \\$1 }" | grep -v RC4`; do echo "Testing $cipher" $ssltest -cipher $cipher -dtls1 |