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/pkeyparam.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/pkeyparam.c')
| -rw-r--r-- | apps/pkeyparam.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c index a387db9e84..fe07ea7645 100644 --- a/apps/pkeyparam.c +++ b/apps/pkeyparam.c @@ -33,6 +33,7 @@ const OPTIONS pkeyparam_options[] = { int pkeyparam_main(int argc, char **argv) { + ENGINE *e = NULL; BIO *in = NULL, *out = NULL; EVP_PKEY *pkey = NULL; int text = 0, noout = 0, ret = 1; @@ -58,7 +59,7 @@ int pkeyparam_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_TEXT: text = 1; @@ -95,6 +96,7 @@ int pkeyparam_main(int argc, char **argv) end: EVP_PKEY_free(pkey); + release_engine(e); BIO_free_all(out); BIO_free(in); |