[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  2c9ba46c90e9d25040260bbdc43e87921f08c788 (commit)
      from  64fdea12beb7fa0a1c2d2c67ee998e3e5d895b0b (commit)


- Log -----------------------------------------------------------------
commit 2c9ba46c90e9d25040260bbdc43e87921f08c788
Author: Benny Baumann <BenBE at geshi.org>
Date:   Wed Jun 24 21:54:05 2020 +0200

    Force ssl/tls protocol flags to use stream sockets
    
    Prior to this patch doing something like
      openssl s_client -dtls1 -tls1 ...
    could cause s_client to speak TLS on a UDP socket
    which does not normally make much sense.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12266)

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

Summary of changes:
 apps/s_client.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index 886b2cd8d6..5a5a40c927 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1319,22 +1319,42 @@ int s_client_main(int argc, char **argv)
         case OPT_SSL3:
             min_version = SSL3_VERSION;
             max_version = SSL3_VERSION;
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1_3:
             min_version = TLS1_3_VERSION;
             max_version = TLS1_3_VERSION;
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1_2:
             min_version = TLS1_2_VERSION;
             max_version = TLS1_2_VERSION;
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1_1:
             min_version = TLS1_1_VERSION;
             max_version = TLS1_1_VERSION;
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_TLS1:
             min_version = TLS1_VERSION;
             max_version = TLS1_VERSION;
+            socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+            isdtls = 0;
+#endif
             break;
         case OPT_DTLS:
 #ifndef OPENSSL_NO_DTLS