[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  574ca403c81edc1f21229526e2a8a67bcdabeb99 (commit)
      from  5b888e931b64a132a0cd33b24344dc6cdac74727 (commit)


- Log -----------------------------------------------------------------
commit 574ca403c81edc1f21229526e2a8a67bcdabeb99
Author: Petr Gotthard <petr.gotthard at centrum.cz>
Date:   Mon Feb 15 20:07:27 2021 +0100

    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 at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/14195)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 2 +-
 apps/s_server.c | 4 ++--
 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;