diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-28 12:09:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-04-28 23:13:14 +0200 |
| commit | 15a6036c4de361b1651e01cb39768fecc27d87dd (patch) | |
| tree | c5574f8806008306fc5fcc666e5d18ec465eaf52 | |
| parent | 52c11d5afd18405eaa293bb881eddf23f408850f (diff) | |
| download | otp-15a6036c4de361b1651e01cb39768fecc27d87dd.tar.gz otp-15a6036c4de361b1651e01cb39768fecc27d87dd.tar.bz2 otp-15a6036c4de361b1651e01cb39768fecc27d87dd.zip | |
ssl: Update tests to reflect sslv3 is not supported by default
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 9c60a6315e..5ae4309b99 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -167,7 +167,15 @@ end_per_suite(_Config) -> application:stop(crypto). init_per_group(basic, Config0) -> - ssl_test_lib:clean_tls_version(Config0); + case ssl_test_lib:supports_ssl_tls_version('tlsv1.2') + orelse ssl_test_lib:supports_ssl_tls_version('tlsv1.1') + orelse ssl_test_lib:supports_ssl_tls_version('tlsv1') + of + true -> + ssl_test_lib:clean_tls_version(Config0); + false -> + {skip, "only sslv3 supported by OpenSSL"} + end; init_per_group(GroupName, Config) -> case ssl_test_lib:is_tls_version(GroupName) of @@ -381,7 +389,7 @@ basic_erlang_server_openssl_client(Config) when is_list(Config) -> Exe = "openssl", Args = ["s_client", "-connect", hostname_format(Hostname) ++ - ":" ++ integer_to_list(Port) ++ no_v2_flag() | workaround_openssl_s_clinent()], + ":" ++ integer_to_list(Port) ++ no_low_flag() | workaround_openssl_s_clinent()], OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), true = port_command(OpenSslPort, Data), @@ -1963,10 +1971,10 @@ hostname_format(Hostname) -> "localhost" end. -no_v2_flag() -> +no_low_flag() -> case ssl_test_lib:supports_ssl_tls_version(sslv2) of true -> - " -no_ssl2 "; + " -no_ssl2 -no_ssl3"; false -> - "" + " -no_ssl3" end. |