diff options
| author | Hans Nilsson <[email protected]> | 2018-01-08 13:42:02 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-02-22 13:18:20 +0100 |
| commit | 3339ecf6d991d38e5f2676da90f98ebcd9243c80 (patch) | |
| tree | 0b4deb379e28f8e267871f24061d80e3957dcb0e /lib | |
| parent | 398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff) | |
| download | otp-3339ecf6d991d38e5f2676da90f98ebcd9243c80.tar.gz otp-3339ecf6d991d38e5f2676da90f98ebcd9243c80.tar.bz2 otp-3339ecf6d991d38e5f2676da90f98ebcd9243c80.zip | |
ssh: Fix hanging engine test case on an old outdated version
OpenSSL 1.0.1s-freebsd 1 Mar 2016
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/test/ssh_engine_SUITE.erl | 26 |
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 ). |