diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-09-28 23:39:18 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-10-20 08:59:53 +0200 |
| commit | 233bcb95dd7299d98ad235d6ba16c1b5726c9276 (patch) | |
| tree | 5d80dd7ea98c25c124516eb43e5428256dd6804c /apps/pkcs7.c | |
| parent | e7a5f50da09324aeb77386f30cd1110eb5e917f2 (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)
(cherry picked from commit dd1abd4462e4e4fa84b8f8de2ec70375f9b0e191)
Diffstat (limited to 'apps/pkcs7.c')
| -rw-r--r-- | apps/pkcs7.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/pkcs7.c b/apps/pkcs7.c index 85994cda26..209e30d63f 100644 --- a/apps/pkcs7.c +++ b/apps/pkcs7.c @@ -44,6 +44,7 @@ OPTIONS pkcs7_options[] = { int pkcs7_main(int argc, char **argv) { + ENGINE *e = NULL; PKCS7 *p7 = NULL; BIO *in = NULL, *out = NULL; int informat = FORMAT_PEM, outformat = FORMAT_PEM; @@ -90,7 +91,7 @@ int pkcs7_main(int argc, char **argv) print_certs = 1; break; case OPT_ENGINE: - (void)setup_engine(opt_arg(), 0); + e = setup_engine(opt_arg(), 0); break; } } @@ -189,6 +190,7 @@ int pkcs7_main(int argc, char **argv) ret = 0; end: PKCS7_free(p7); + release_engine(e); BIO_free(in); BIO_free_all(out); return (ret); |