diff options
| author | Eneas U de Queiroz <cote2004-github@yahoo.com> | 2018-11-05 17:59:42 -0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-10 13:22:14 +0100 |
| commit | be5cf61caa425070ec4f3e925d4e9aa484c8315b (patch) | |
| tree | eaabe43232d13b99b85c9ed4733c575aaa6172d0 /crypto | |
| parent | 72b8228a9c0711bdc1f5f2a9f49bef0bb50ffb58 (diff) | |
eng_devcrypto: don't leak methods tables
Call functions to prepare methods after confirming that /dev/crytpo was
sucessfully open and that the destroy function has been set.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7585)
(cherry picked from commit d9d4dff5c640990d45af115353fc9f88a497a56c)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/engine/eng_devcrypto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c index 4a0ba09a38..ee26398b69 100644 --- a/crypto/engine/eng_devcrypto.c +++ b/crypto/engine/eng_devcrypto.c @@ -619,11 +619,6 @@ void engine_load_devcrypto_int() return; } - prepare_cipher_methods(); -#ifdef IMPLEMENT_DIGEST - prepare_digest_methods(); -#endif - if ((e = ENGINE_new()) == NULL || !ENGINE_set_destroy_function(e, devcrypto_unload)) { ENGINE_free(e); @@ -636,6 +631,11 @@ void engine_load_devcrypto_int() return; } + prepare_cipher_methods(); +#ifdef IMPLEMENT_DIGEST + prepare_digest_methods(); +#endif + if (!ENGINE_set_id(e, "devcrypto") || !ENGINE_set_name(e, "/dev/crypto engine") |