diff options
| author | James E. King III <jking@apache.org> | 2018-06-08 03:37:55 +0000 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-06-16 19:16:04 +0000 |
| commit | f5f430df56871bc937950274b2c86681d3db6e59 (patch) | |
| tree | a9f6f1258ea16a51915dd18799af3230d36d1630 /test/features | |
| parent | b5471f63cb4bb8e3b00835a9ca9e48ff76a3bb51 (diff) | |
| download | thrift-f5f430df56871bc937950274b2c86681d3db6e59.tar.gz | |
THRIFT-4579: Move up to Ubuntu Bionic for CI builds
make dlang library compatible with openssl-1.1 for Ubuntu Bionic
Requires an upstream deimos update to be compatible.
Diffstat (limited to 'test/features')
| -rwxr-xr-x | test/features/nosslv3.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/features/nosslv3.sh b/test/features/nosslv3.sh index e550d511c..38cca0786 100755 --- a/test/features/nosslv3.sh +++ b/test/features/nosslv3.sh @@ -32,6 +32,13 @@ function nosslv3 { local nego local negodenied + local opensslv + + opensslv=$(openssl version | cut -d' ' -f2) + if [[ $opensslv > "1.0" ]]; then + echo "[pass] OpenSSL 1.1 or later - no need to check ssl3" + return 0 + fi # echo "openssl s_client -connect $THRIFTHOST:$THRIFTPORT -CAfile ../keys/CA.pem -ssl3 2>&1 < /dev/null" nego=$(openssl s_client -connect $THRIFTHOST:$THRIFTPORT -CAfile ../keys/CA.pem -ssl3 2>&1 < /dev/null) |