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/dhparam.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/dhparam.c')
| -rw-r--r-- | apps/dhparam.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index 302be2dd57..5fca25e17a 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -70,6 +70,7 @@ int dhparam_main(int argc, char **argv) BIO *in = NULL, *out = NULL; DH *dh = NULL; char *infile = NULL, *outfile = NULL, *prog, *inrand = NULL; + ENGINE *e = NULL; #ifndef OPENSSL_NO_DSA int dsaparam = 0; #endif @@ -104,7 +105,7 @@ int dhparam_main(int argc, char **argv) outfile = opt_arg(); break; case OPT_ENGINE: - (void)setup_engine(opt_arg(), 0); + e = setup_engine(opt_arg(), 0); break; case OPT_CHECK: check = 1; @@ -356,6 +357,7 @@ int dhparam_main(int argc, char **argv) BIO_free(in); BIO_free_all(out); DH_free(dh); + release_engine(e); return (ret); } |