summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorPetr Gotthard <petr.gotthard@centrum.cz>2021-02-15 20:07:27 +0100
committerShane Lontis <shane.lontis@oracle.com>2021-02-17 11:17:54 +1000
commit574ca403c81edc1f21229526e2a8a67bcdabeb99 (patch)
tree4e95891df6ea4cbfefcc376a62fd224513b55eeb /apps
parent5b888e931b64a132a0cd33b24344dc6cdac74727 (diff)
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 <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/14195)
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c2
-rw-r--r--apps/s_server.c4
2 files changed, 3 insertions, 3 deletions
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;