aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-02-22 13:21:49 +0100
committerHans Nilsson <[email protected]>2018-02-22 13:21:49 +0100
commit4c21bcd5bd08d67f00471455f9489867cc1766fc (patch)
tree776391f7b2af10cf77230f3d20b3df6e44f68e40 /lib
parent41979694d18637c62433a44aaf4a07b2e02e104d (diff)
parent83f8be4d44e6b8cab0ff9fd4bc423c477f72ec32 (diff)
downloadotp-4c21bcd5bd08d67f00471455f9489867cc1766fc.tar.gz
otp-4c21bcd5bd08d67f00471455f9489867cc1766fc.tar.bz2
otp-4c21bcd5bd08d67f00471455f9489867cc1766fc.zip
Merge branch 'maint'
* maint: ssh: Fix hanging engine test case on an old outdated version
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/test/ssh_engine_SUITE.erl26
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/ssh/test/ssh_engine_SUITE.erl b/lib/ssh/test/ssh_engine_SUITE.erl
index daf93891e9..c131a70973 100644
--- a/lib/ssh/test/ssh_engine_SUITE.erl
+++ b/lib/ssh/test/ssh_engine_SUITE.erl
@@ -55,16 +55,22 @@ basic_tests() ->
init_per_suite(Config) ->
ssh:start(),
?CHECK_CRYPTO(
- case load_engine() of
- {ok,E} ->
- [{engine,E}|Config];
- {error, notsup} ->
- {skip, "Engine not supported on this OpenSSL version"};
- {error, bad_engine_id} ->
- {skip, "Dynamic Engine not supported"};
- Other ->
- ct:log("Engine load failed: ~p",[Other]),
- {fail, "Engine load failed"}
+ case crypto:info_lib() of
+ [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}] ->
+ {skip, "Strange Engine stuff"};
+
+ _ ->
+ case load_engine() of
+ {ok,E} ->
+ [{engine,E}|Config];
+ {error, notsup} ->
+ {skip, "Engine not supported on this OpenSSL version"};
+ {error, bad_engine_id} ->
+ {skip, "Dynamic Engine not supported"};
+ Other ->
+ ct:log("Engine load failed: ~p",[Other]),
+ {fail, "Engine load failed"}
+ end
end
).