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/verify.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/verify.c')
| -rw-r--r-- | apps/verify.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/verify.c b/apps/verify.c index a8a6209a1b..bd8349a508 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -60,6 +60,7 @@ const OPTIONS verify_options[] = { int verify_main(int argc, char **argv) { + ENGINE *e = NULL; STACK_OF(X509) *untrusted = NULL, *trusted = NULL; STACK_OF(X509_CRL) *crls = NULL; X509_STORE *store = NULL; @@ -140,7 +141,7 @@ int verify_main(int argc, char **argv) crl_download = 1; break; case OPT_ENGINE: - if (setup_engine(opt_arg(), 0) == NULL) { + if ((e = setup_engine(opt_arg(), 0)) == NULL) { /* Failure message already displayed */ goto end; } @@ -191,6 +192,7 @@ int verify_main(int argc, char **argv) sk_X509_pop_free(untrusted, X509_free); sk_X509_pop_free(trusted, X509_free); sk_X509_CRL_pop_free(crls, X509_CRL_free); + release_engine(e); return (ret < 0 ? 2 : ret); } |