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)

diff --git a/apps/s_client.c b/apps/s_client.c
index a6394462dbd056c934a64329c7ff64003d852aaf..431df131ddad9a8f252e22f2c4e793fad67e6d0d 100644 (file)
--- 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 5d8fb990235c6245d484f0a9fb8d37b737cda832..eee51f33254cfc60f137207001e72f4c58b75c70 100644 (file)
--- 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;