From 574ca403c81edc1f21229526e2a8a67bcdabeb99 Mon Sep 17 00:00:00 2001 From: Petr Gotthard Date: Mon, 15 Feb 2021 20:07:27 +0100 Subject: Replace SSL_CTX_new by SSL_CTX_new_ex in apps/s_server + s_client The `openssl s_server` and `openssl s_client` currently ignore the `-propquery` parameter. Fix patch fixes this. Reviewed-by: Matt Caswell Reviewed-by: Paul Dale Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/14195) --- apps/s_client.c | 2 +- apps/s_server.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/s_client.c b/apps/s_client.c index a6394462db..431df131dd 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1661,7 +1661,7 @@ int s_client_main(int argc, char **argv) } #endif - ctx = SSL_CTX_new(meth); + ctx = SSL_CTX_new_ex(app_get0_libctx(), app_get0_propq(), meth); if (ctx == NULL) { ERR_print_errors(bio_err); goto end; diff --git a/apps/s_server.c b/apps/s_server.c index 5d8fb99023..eee51f3325 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1780,7 +1780,7 @@ int s_server_main(int argc, char *argv[]) s_key_file2 = NULL; } - ctx = SSL_CTX_new(meth); + ctx = SSL_CTX_new_ex(app_get0_libctx(), app_get0_propq(), meth); if (ctx == NULL) { ERR_print_errors(bio_err); goto end; @@ -1905,7 +1905,7 @@ int s_server_main(int argc, char *argv[]) } if (s_cert2) { - ctx2 = SSL_CTX_new(meth); + ctx2 = SSL_CTX_new_ex(app_get0_libctx(), app_get0_propq(), meth); if (ctx2 == NULL) { ERR_print_errors(bio_err); goto end; -- cgit v1.2.3