summaryrefslogtreecommitdiffstats
path: root/apps/s_client.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-09-28 23:39:18 +0200
committerRichard Levitte <richard@levitte.org>2016-10-20 08:59:53 +0200
commit233bcb95dd7299d98ad235d6ba16c1b5726c9276 (patch)
tree5d80dd7ea98c25c124516eb43e5428256dd6804c /apps/s_client.c
parente7a5f50da09324aeb77386f30cd1110eb5e917f2 (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/s_client.c')
-rw-r--r--apps/s_client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index 6ec792cee1..a14d8855b3 100644
--- 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);