diff options
| author | Hans Nilsson <[email protected]> | 2018-12-03 10:21:37 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-12-03 10:21:37 +0100 |
| commit | cd7a8c3feaeb500ba7d80129a19693edc0a54776 (patch) | |
| tree | 2c60279268994cf90edde9616374a59384d4b03f /lib/crypto/test | |
| parent | c85094dddfa54bb3991d7ba6147ef177c0dd9c42 (diff) | |
| parent | a86d641607b7b5ba0be455725b33ded0a5470509 (diff) | |
| download | otp-cd7a8c3feaeb500ba7d80129a19693edc0a54776.tar.gz otp-cd7a8c3feaeb500ba7d80129a19693edc0a54776.tar.bz2 otp-cd7a8c3feaeb500ba7d80129a19693edc0a54776.zip | |
Merge branch 'maint'
* maint:
crypto: Engine valgrind fix
crypto: Fix valgrind error in dh_generate/dh_compute
crypto: Fix valgrind errors in pkey_crypt_nif
crypto: Add some crypto:engine_unload in engine test suite
crypto: Fix valgrind errors in privkey_to_pubkey
crypto: Fix valgrind error for keys with passwords in Engines
Diffstat (limited to 'lib/crypto/test')
| -rw-r--r-- | lib/crypto/test/engine_SUITE.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl index 9c893c5e36..2a89fa71a3 100644 --- a/lib/crypto/test/engine_SUITE.erl +++ b/lib/crypto/test/engine_SUITE.erl @@ -587,11 +587,11 @@ ctrl_cmd_string(Config) when is_list(Config) -> {ok, E} -> case crypto:engine_ctrl_cmd_string(E, <<"TEST">>, <<"17">>) of ok -> + ok = crypto:engine_unload(E), ct:fail(fail_ctrl_cmd_should_fail); {error,ctrl_cmd_failed} -> - ok - end, - ok = crypto:engine_unload(E); + ok = crypto:engine_unload(E) + end; {error, bad_engine_id} -> {skip, "Dynamic Engine not supported"} end @@ -617,11 +617,12 @@ ctrl_cmd_string_optional(Config) when is_list(Config) -> {ok, E} -> case crypto:engine_ctrl_cmd_string(E, <<"TEST">>, <<"17">>, true) of ok -> - ok; - _ -> + ok = crypto:engine_unload(E); + Err -> + ct:log("Error: ~p",[Err]), + ok = crypto:engine_unload(E), ct:fail(fail_ctrl_cmd_string) - end, - ok = crypto:engine_unload(E); + end; {error, bad_engine_id} -> {skip, "Dynamic Engine not supported"} end |