diff options
author | Matt Caswell <matt@openssl.org> | 2015-11-13 23:54:44 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-11-20 23:39:30 +0000 |
commit | 68487a9b0631d27be9a1f4565e7e652ae9cb6aad (patch) | |
tree | f08b9aedfa12d06d5602f2422def273b96f7ea2c /apps/s_client.c | |
parent | 27949c353e68825f119410f8fd73ae1d667581c7 (diff) |
Convert __thread to pthreads for Thread Local Storage
In theory the pthreads approach for Thread Local Storage should be more
portable.
This also changes some APIs in order to accommodate this change. In
particular ASYNC_init_pool is renamed ASYNC_init_thread and
ASYNC_free_pool is renamed ASYNC_cleanup_thread. Also introduced ASYNC_init
and ASYNC_cleanup.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/s_client.c')
-rw-r--r-- | apps/s_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 4a93b3de54..d90124d4e8 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1208,7 +1208,7 @@ int s_client_main(int argc, char **argv) if (async) { SSL_CTX_set_mode(ctx, SSL_MODE_ASYNC); - ASYNC_init_pool(0, 0); + ASYNC_init(1, 0, 0); } if (!config_ctx(cctx, ssl_args, ctx, 1, jpake_secret == NULL)) @@ -2102,7 +2102,7 @@ int s_client_main(int argc, char **argv) SSL_free(con); } if (async) { - ASYNC_free_pool(); + ASYNC_cleanup(1); } #if !defined(OPENSSL_NO_NEXTPROTONEG) OPENSSL_free(next_proto.data); |