Merge branch 'maint'

* maint:
  ssh: Fix hanging engine test case on an old outdated version

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
       ).