summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2019-05-07 16:01:20 +0200
committerIngela Anderton Andin <ingela@erlang.org>2019-05-07 16:01:20 +0200
commit79df59b5e0643a236fdc238e7417053f84e50c77 (patch)
treeaf05fd7a40869a3733cebba2bc4e209bb6ed5a1e
parent1ca6e644e58ac02cfb11c97d5a363caa467c1f53 (diff)
parent3f23d6414f3e740f8731e88b78ca207f8dca4120 (diff)
downloaderlang-79df59b5e0643a236fdc238e7417053f84e50c77.tar.gz
Merge branch 'ingela/ssl/openssl-test-cuddle'
* ingela/ssl/openssl-test-cuddle: ssl: Add necessary compliance check
-rw-r--r--lib/ssl/test/openssl_server_cipher_suite_SUITE.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl
index 907de1abe2..6ce34ce7fa 100644
--- a/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl
+++ b/lib/ssl/test/openssl_server_cipher_suite_SUITE.erl
@@ -185,7 +185,13 @@ init_per_group(GroupName, Config) ->
true ->
case ssl_test_lib:supports_ssl_tls_version(GroupName) of
true ->
- do_init_per_group(GroupName, Config);
+ case ssl_test_lib:check_sane_openssl_version(GroupName) of
+ true ->
+ ssl_test_lib:init_tls_version(GroupName, Config),
+ do_init_per_group(GroupName, Config);
+ false ->
+ {skip, openssl_does_not_support_version}
+ end;
false ->
{skip, {openssl_does_not_support, GroupName}}
end;