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)

diff --git a/apps/apps.c b/apps/apps.c
index 96184a6fb7e39d288a7d9e62c900c1b3f24f4c18..4258b311d860313df6e488802a8ec4b2bc5ab691 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1272,14 +1272,20 @@ ENGINE *setup_engine(const char *engine, int debug)
         }
 
         BIO_printf(bio_err, "engine \"%s\" set.\n", ENGINE_get_id(e));
-
-        /* Free our "structural" reference. */
-        ENGINE_free(e);
     }
     return e;
 }
 #endif
 
+void release_engine(ENGINE *e)
+{
+#ifndef OPENSSL_NO_ENGINE
+    if (e != NULL)
+        /* Free our "structural" reference. */
+        ENGINE_free(e);
+#endif
+}
+
 static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
 {
     const char *n;

diff --git a/apps/apps.h b/apps/apps.h
index 27e182c580182e81f77218345bd770782124d4fb..8ff84674b6d0615b0020e99af84d1b970a1cf221 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -435,6 +435,7 @@ __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
 # else
 ENGINE *setup_engine(const char *engine, int debug);
 # endif
+void release_engine(ENGINE *e);
 # ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
                                  const char *host, const char *path,

diff --git a/apps/ca.c b/apps/ca.c
index 34dfd9b9569b55af60e13fbd8154a3844009e890..03e08b4a636bf7f0dc1e869623c2c18c30cb1c0a 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1236,6 +1236,7 @@ end_of_options:
     X509_CRL_free(crl);
     NCONF_free(conf);
     NCONF_free(extconf);
+    release_engine(e);
     return (ret);
 }
 

diff --git a/apps/cms.c b/apps/cms.c
index 133dc021aedb91044fd38e27c8ff148ed5de644c..579b227301439105156b33400c45463d1482dfa3 100644 (file)
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1109,6 +1109,7 @@ int cms_main(int argc, char **argv)
     EVP_PKEY_free(key);
     CMS_ContentInfo_free(cms);
     CMS_ContentInfo_free(rcms);
+    release_engine(e);
     BIO_free(rctin);
     BIO_free(in);
     BIO_free(indata);

diff --git a/apps/dgst.c b/apps/dgst.c
index b10b93e5880671aa9a90370101470c7fc8b39802..08182e2ab8c228634766adaf2de68927a1efa033 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -398,6 +398,7 @@ int dgst_main(int argc, char **argv)
     sk_OPENSSL_STRING_free(macopts);
     OPENSSL_free(sigbuf);
     BIO_free(bmd);
+    release_engine(e);
     return (ret);
 }
 

diff --git a/apps/dhparam.c b/apps/dhparam.c
index ab2e787f76e4da3e95aa935214b06c52c891ab0b..2223e1aac9f3313714fceb4b5d4ab088324e9473 100644 (file)
--- 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);
 }
 

diff --git a/apps/dsa.c b/apps/dsa.c
index 6aef5026e397d32e2e64f50b1a2ed59563f6224d..bfb08e9600ebd8714b1befcbc5c8281d14dcdf3f 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -249,6 +249,7 @@ int dsa_main(int argc, char **argv)
  end:
     BIO_free_all(out);
     DSA_free(dsa);
+    release_engine(e);
     OPENSSL_free(passin);
     OPENSSL_free(passout);
     return (ret);

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 404266009eaa7dcb4685bb17d20ac1b8c822154e..925880300ffe5670ea4bc0b3fc49b331d85c7b7f 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -66,6 +66,7 @@ OPTIONS dsaparam_options[] = {
 
 int dsaparam_main(int argc, char **argv)
 {
+    ENGINE *e = NULL;
     DSA *dsa = NULL;
     BIO *in = NULL, *out = NULL;
     BN_GENCB *cb = NULL;
@@ -105,7 +106,7 @@ int dsaparam_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_TIMEBOMB:
 # ifdef GENCB_TEST
@@ -285,6 +286,7 @@ int dsaparam_main(int argc, char **argv)
     BIO_free(in);
     BIO_free_all(out);
     DSA_free(dsa);
+    release_engine(e);
     return (ret);
 }
 

diff --git a/apps/ec.c b/apps/ec.c
index 007bf0a89c95a52f8ca5d4df6ea8150660dac5e1..2516c032429835f775afb797931ca217788ec1cb 100644 (file)
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -273,6 +273,7 @@ int ec_main(int argc, char **argv)
     BIO_free(in);
     BIO_free_all(out);
     EC_KEY_free(eckey);
+    release_engine(e);
     OPENSSL_free(passin);
     OPENSSL_free(passout);
     return (ret);

diff --git a/apps/ecparam.c b/apps/ecparam.c
index 4e6cf22908f93dfaf4fcb861551ae5026a769c91..891a0cac0cedcf2396312eb28dce1809990fb2ec 100644 (file)
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -87,6 +87,7 @@ static OPT_PAIR encodings[] = {
 
 int ecparam_main(int argc, char **argv)
 {
+    ENGINE *e = NULL;
     BIGNUM *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
     BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL;
     BIO *in = NULL, *out = NULL;
@@ -168,7 +169,7 @@ int ecparam_main(int argc, char **argv)
             need_rand = 1;
             break;
         case OPT_ENGINE:
-            (void)setup_engine(opt_arg(), 0);
+            e = setup_engine(opt_arg(), 0);
             break;
         }
     }
@@ -454,9 +455,10 @@ int ecparam_main(int argc, char **argv)
     BN_free(ec_order);
     BN_free(ec_cofactor);
     OPENSSL_free(buffer);
+    EC_GROUP_free(group);
+    release_engine(e);
     BIO_free(in);
     BIO_free_all(out);
-    EC_GROUP_free(group);
     return (ret);
 }
 

diff --git a/apps/enc.c b/apps/enc.c
index 10ab15af27c1a3e3ecd0b12cda48c04b49b12de5..c66ad933f674aa079f69d1cb1f6bf23d4a12e8b8 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -82,6 +82,7 @@ int enc_main(int argc, char **argv)
 {
     static char buf[128];
     static const char magic[] = "Salted__";
+    ENGINE *e = NULL;
     BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio =
         NULL, *wbio = NULL;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -151,7 +152,7 @@ int enc_main(int argc, char **argv)
             passarg = opt_arg();
             break;
         case OPT_ENGINE:
-            (void)setup_engine(opt_arg(), 0);
+            e = setup_engine(opt_arg(), 0);
             break;
         case OPT_D:
             enc = 0;
@@ -552,6 +553,7 @@ int enc_main(int argc, char **argv)
 #ifdef ZLIB
     BIO_free(bzl);
 #endif
+    release_engine(e);
     OPENSSL_free(pass);
     return (ret);
 }

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 4c05493bfa5d92be32e3737294501818169b6832..bdef022cff4f2fd9fd1bebc5d20404fa53ccad57 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -46,6 +46,7 @@ OPTIONS gendsa_options[] = {
 
 int gendsa_main(int argc, char **argv)
 {
+    ENGINE *e = NULL;
     BIO *out = NULL, *in = NULL;
     DSA *dsa = NULL;
     const EVP_CIPHER *enc = NULL;
@@ -74,7 +75,7 @@ int gendsa_main(int argc, char **argv)
             passoutarg = opt_arg();
             break;
         case OPT_ENGINE:
-            (void)setup_engine(opt_arg(), 0);
+            e = setup_engine(opt_arg(), 0);
             break;
         case OPT_RAND:
             inrand = opt_arg();
@@ -139,6 +140,7 @@ int gendsa_main(int argc, char **argv)
     BIO_free(in);
     BIO_free_all(out);
     DSA_free(dsa);
+    release_engine(e);
     OPENSSL_free(passout);
     return (ret);
 }

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 7abb3e6ff11f4bb24562325674d1454476bd0844..9e37977252e0b127268fb766e49887c8ff502500 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -193,8 +193,8 @@ int genpkey_main(int argc, char **argv)
     EVP_PKEY_CTX_free(ctx);
     BIO_free_all(out);
     BIO_free(in);
+    release_engine(e);
     OPENSSL_free(pass);
-
     return ret;
 }
 

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 4d104d2882c2d6f10d8ed9deb0cc3b0bd85702de..1ac66a97ded7820b0fd9ea9b1ccb2f0580465bdf 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -166,6 +166,7 @@ int genrsa_main(int argc, char **argv)
     BN_GENCB_free(cb);
     RSA_free(rsa);
     BIO_free_all(out);
+    release_engine(eng);
     OPENSSL_free(passout);
     if (ret != 0)
         ERR_print_errors(bio_err);

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 93489d6a5670840df83f887bc3f5c37416ce1f9a..0e69c9c131413ef100a7af6ded8ecbd8a2f82b1d 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -574,6 +574,7 @@ int pkcs12_main(int argc, char **argv)
     PKCS12_free(p12);
     if (export_cert || inrand)
         app_RAND_write_file(NULL);
+    release_engine(e);
     BIO_free(in);
     BIO_free_all(out);
     sk_OPENSSL_STRING_free(canames);

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 85994cda26cdde1cce7da3c332464bb80a154c4d..209e30d63f6fa7996565b739e1078bb4b49a4d6a 100644 (file)
--- 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);

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 3592a0f1dc21b13ac908a921bd3f7bd0cd742aa1..93ffdd55e8586f3bf01b43540757075926059c0d 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -343,6 +343,7 @@ int pkcs8_main(int argc, char **argv)
     X509_SIG_free(p8);
     PKCS8_PRIV_KEY_INFO_free(p8inf);
     EVP_PKEY_free(pkey);
+    release_engine(e);
     BIO_free_all(out);
     BIO_free(in);
     OPENSSL_free(passin);

diff --git a/apps/pkey.c b/apps/pkey.c
index 50ee05f7849962a8db13eb59d9902571ecafed53..ad1a3b10ebc6cf07f76819d34073c03503ed94c2 100644 (file)
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -180,6 +180,7 @@ int pkey_main(int argc, char **argv)
 
  end:
     EVP_PKEY_free(pkey);
+    release_engine(e);
     BIO_free_all(out);
     BIO_free(in);
     OPENSSL_free(passin);

diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index f6bcb8f84efe4018a2e935e7c0db25a9e50ee021..0a1b2d1283339dc1c15296bea4d066d3b7ab5194 100644 (file)
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -33,6 +33,7 @@ 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);
 

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index 02e28e2665f28c00411623f33c56c86574cdf55e..962a389dc6d6925490fae9a5caca690dc628dd6b 100644 (file)
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -323,6 +323,7 @@ int pkeyutl_main(int argc, char **argv)
 
  end:
     EVP_PKEY_CTX_free(ctx);
+    release_engine(e);
     BIO_free(in);
     BIO_free_all(out);
     OPENSSL_free(buf_in);

diff --git a/apps/rand.c b/apps/rand.c
index d60f1ecf8658f5b47d1cb1570a007cab5d372c1b..e72618027bc03a655218bb9deb812484922b1dd0 100644 (file)
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -39,6 +39,7 @@ OPTIONS rand_options[] = {
 
 int rand_main(int argc, char **argv)
 {
+    ENGINE *e = NULL;
     BIO *out = NULL;
     char *inrand = NULL, *outfile = NULL, *prog;
     OPTION_CHOICE o;
@@ -60,7 +61,7 @@ int rand_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_RAND:
             inrand = opt_arg();
@@ -125,6 +126,7 @@ int rand_main(int argc, char **argv)
  end:
     if (ret != 0)
         ERR_print_errors(bio_err);
+    release_engine(e);
     BIO_free_all(out);
     return (ret);
 }

diff --git a/apps/req.c b/apps/req.c
index 8ebe1eca6d4589d3f2f2f949105d268472ef1cb8..2707dc9e367d7fb656c68058b79a7a4680f49648 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -820,6 +820,7 @@ int req_main(int argc, char **argv)
     X509_REQ_free(req);
     X509_free(x509ss);
     ASN1_INTEGER_free(serial);
+    release_engine(e);
     if (passin != nofree_passin)
         OPENSSL_free(passin);
     if (passout != nofree_passout)

diff --git a/apps/rsa.c b/apps/rsa.c
index bd2f53a6f4fb871b5050d9293d34bbaba70adedc..c3a494d116b43dcca967674ed0ba6c6460a025cd 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -294,6 +294,7 @@ int rsa_main(int argc, char **argv)
     } else
         ret = 0;
  end:
+    release_engine(e);
     BIO_free_all(out);
     RSA_free(rsa);
     OPENSSL_free(passin);

diff --git a/apps/rsautl.c b/apps/rsautl.c
index 84f0164cebb61b72e8beed24d6ce8316db6a1e7e..d527bf4d8e168840187214902100a58604d3f579 100644 (file)
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -267,6 +267,7 @@ int rsautl_main(int argc, char **argv)
         BIO_write(out, rsa_out, rsa_outlen);
  end:
     RSA_free(rsa);
+    release_engine(e);
     BIO_free(in);
     BIO_free_all(out);
     OPENSSL_free(rsa_in);

diff --git a/apps/s_client.c b/apps/s_client.c
index 6ec792cee1752f7cec72c000f41fb3cf00ae0556..a14d8855b39968a9850c07b201dc68c0beee5188 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2485,6 +2485,7 @@ int s_client_main(int argc, char **argv)
     OPENSSL_clear_free(cbuf, BUFSIZZ);
     OPENSSL_clear_free(sbuf, BUFSIZZ);
     OPENSSL_clear_free(mbuf, BUFSIZZ);
+    release_engine(e);
     BIO_free(bio_c_out);
     bio_c_out = NULL;
     BIO_free(bio_c_msg);

diff --git a/apps/s_server.c b/apps/s_server.c
index 2051459c3b34e2e17a87d0e2a8e11fcb4905ddda..9eb226b2f2e512cd9ced747bce35215381299d8c 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1963,6 +1963,7 @@ int s_server_main(int argc, char *argv[])
     ssl_excert_free(exc);
     sk_OPENSSL_STRING_free(ssl_args);
     SSL_CONF_CTX_free(cctx);
+    release_engine(engine);
     BIO_free(bio_s_out);
     bio_s_out = NULL;
     BIO_free(bio_s_msg);

diff --git a/apps/smime.c b/apps/smime.c
index 1f4091fa992b71164b125a46e8d4a72d80d7235f..caa9252e2ab5c2e3f4e34b93c2dee03542d62519 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -614,6 +614,7 @@ int smime_main(int argc, char **argv)
     X509_free(signer);
     EVP_PKEY_free(key);
     PKCS7_free(p7);
+    release_engine(e);
     BIO_free(in);
     BIO_free(indata);
     BIO_free_all(out);

diff --git a/apps/speed.c b/apps/speed.c
index e6bdc5dd2f7e9f6b8d5ad9d3641f96f70dcd2ea6..8437ab20258dae25b19d0ca1c99f1238291f6a5e 100644 (file)
--- 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);
 }
 

diff --git a/apps/spkac.c b/apps/spkac.c
index c65103d6a09020d1e7550b0a16b7255abb1e208b..90a5beab425d49cdcdb50c884e16aa3883989be3 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -187,6 +187,7 @@ int spkac_main(int argc, char **argv)
     NETSCAPE_SPKI_free(spki);
     BIO_free_all(out);
     EVP_PKEY_free(pkey);
+    release_engine(e);
     OPENSSL_free(passin);
     return (ret);
 }

diff --git a/apps/srp.c b/apps/srp.c
index 69175ebc58c633116f77ad2beadc7b3848cdc870..add010037cfe0bd82224b5c4bd12a6736aafc13b 100644 (file)
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -209,6 +209,7 @@ OPTIONS srp_options[] = {
 
 int srp_main(int argc, char **argv)
 {
+    ENGINE *e = NULL;
     CA_DB *db = NULL;
     CONF *conf = NULL;
     int gNindex = -1, maxgN = -1, ret = 1, errors = 0, verbose = 0, i;
@@ -269,7 +270,7 @@ int srp_main(int argc, char **argv)
             passoutarg = opt_arg();
             break;
         case OPT_ENGINE:
-            (void)setup_engine(opt_arg(), 0);
+            e = setup_engine(opt_arg(), 0);
             break;
         }
     }
@@ -602,6 +603,7 @@ int srp_main(int argc, char **argv)
         app_RAND_write_file(randfile);
     NCONF_free(conf);
     free_index(db);
+    release_engine(e);
     return (ret);
 }
 #endif

diff --git a/apps/verify.c b/apps/verify.c
index 47a8c86cc34cd81227f20ed1e201d62d94ff860b..3c4566393b83551804a22d9a07c6aa6704c5e2fe 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -60,6 +60,7 @@ 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);
 }
 

diff --git a/apps/x509.c b/apps/x509.c
index 3539602e1e08bcc762caf34f70cdb02e90f7cc32..577c35dd410219ed44a2dbc8e22da8abfc22472d 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -893,6 +893,7 @@ int x509_main(int argc, char **argv)
     sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
     sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
     ASN1_OBJECT_free(objtmp);
+    release_engine(e);
     OPENSSL_free(passin);
     return (ret);
 }