aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-02-08 16:43:03 +0000
committerMatt Caswell <matt@openssl.org>2016-02-09 15:11:38 +0000
commit7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59 (patch)
tree30f805756265bd1d016aead84dcf1c909cca8b4b /apps
parentb184e3ef73200cb3b7914a603b43a5b8a074c85f (diff)
downloadopenssl-7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59.tar.gz
Auto init/deinit libcrypto
This builds on the previous commit to auto initialise/deinitialise libcrypto. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c4
-rw-r--r--apps/s_server.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index 8fe16121a9..c122c1a613 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1504,7 +1504,6 @@ int s_client_main(int argc, char **argv)
if (async) {
SSL_CTX_set_mode(ctx, SSL_MODE_ASYNC);
- ASYNC_init(1, 0, 0);
}
if (!config_ctx(cctx, ssl_args, ctx, jpake_secret == NULL))
@@ -2420,9 +2419,6 @@ int s_client_main(int argc, char **argv)
print_stuff(bio_c_out, con, 1);
SSL_free(con);
}
- if (async) {
- ASYNC_cleanup(1);
- }
#if !defined(OPENSSL_NO_NEXTPROTONEG)
OPENSSL_free(next_proto.data);
#endif
diff --git a/apps/s_server.c b/apps/s_server.c
index f07c8f61a9..368558637d 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1721,7 +1721,6 @@ int s_server_main(int argc, char *argv[])
if (async) {
SSL_CTX_set_mode(ctx, SSL_MODE_ASYNC);
- ASYNC_init(1, 0, 0);
}
#ifndef OPENSSL_NO_SRTP
@@ -2026,9 +2025,6 @@ int s_server_main(int argc, char *argv[])
bio_s_out = NULL;
BIO_free(bio_s_msg);
bio_s_msg = NULL;
- if (async) {
- ASYNC_cleanup(1);
- }
return (ret);
}