diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-09-28 23:39:18 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-10-19 17:44:08 +0200 |
| commit | dd1abd4462e4e4fa84b8f8de2ec70375f9b0e191 (patch) | |
| tree | 66ed9bf5494cf999e57f754b5fa43ccd51ffc36e /apps/speed.c | |
| parent | e972273194303e15f8dd7ce69dbcfa27cc024e9f (diff) | |
If an engine comes up explicitely, it must also come down explicitely
In apps/apps.c, one can set up an engine with setup_engine().
However, we freed the structural reference immediately, which means
that for engines that don't already have a structural reference
somewhere else (because it's a built in engine), we end up returning
an invalid reference.
Instead, the function release_engine() is added, and called at the end
of the routines that call setup_engine().
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1643)
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/speed.c b/apps/speed.c index bc46d45908..046882fbd6 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1219,6 +1219,7 @@ static int run_benchmark(int async_jobs, int speed_main(int argc, char **argv) { + ENGINE *e = NULL; loopargs_t *loopargs = NULL; int async_init = 0; int loopargs_len = 0; @@ -1566,7 +1567,7 @@ int speed_main(int argc, char **argv) #endif /* Initialize the engine after the fork */ - (void)setup_engine(engine_id, 0); + e = setup_engine(engine_id, 0); /* No parameters; turn on everything. */ if ((argc == 0) && !doit[D_EVP]) { @@ -2819,6 +2820,7 @@ int speed_main(int argc, char **argv) ASYNC_cleanup_thread(); } OPENSSL_free(loopargs); + release_engine(e); return (ret); } |