Windows fixes

include/violite.h

@@ -53,8 +53,16 @@ enum enum_vio_io_event
 
 #define VIO_TLSv1_0   1
 #define VIO_TLSv1_1   2
+#ifdef TLS1_2_VERSION
 #define VIO_TLSv1_2   4
+#else
+#define VIO_TLSv1_2   0
+#endif
+#ifdef TLS1_3_VERSION
 #define VIO_TLSv1_3   8
+#else
+#define VIO_TLSv1_3   0
+#endif
 
 #define VIO_LOCALHOST 1U                        /* a localhost connection */
 #define VIO_BUFFERED_READ 2U                    /* use buffered read */
@@ -171,7 +179,7 @@ struct st_VioSSLFd
                       const char *ca_file,const char *ca_path,
                       const char *cipher, enum enum_ssl_init_error *error,
                       const char *crl_file, const char *crl_path,
-		                  long tls_version);
+		                  ulonglong tls_version);
 void free_vio_ssl_acceptor_fd(struct st_VioSSLFd *fd);
 #endif /* HAVE_OPENSSL */
 

sql/sys_vars.cc

@@ -3222,14 +3222,7 @@ static Sys_var_set Sys_tls_version(
        "TLS protocol version for secure connections.",
        READ_ONLY GLOBAL_VAR(tls_version), CMD_LINE(REQUIRED_ARG),
        tls_version_names,
-       DEFAULT(VIO_TLSv1_0 | VIO_TLSv1_1
-#ifdef TLS1_2_VERSION
-               | VIO_TLSv1_2
-#endif
-#ifdef TLS1_3_VERSION
-               | VIO_TLSv1_3
-#endif
-       ));
+       DEFAULT(VIO_TLSv1_0 | VIO_TLSv1_1 | VIO_TLSv1_2 | VIO_TLSv1_3));
 
 static Sys_var_mybool Sys_standard_compliant_cte(
        "standard_compliant_cte",

vio/viosslfactories.c

@@ -167,7 +167,7 @@ static void check_ssl_init()
   }
 }
 
-static long vio_tls_protocol_options(long tls_version)
+static long vio_tls_protocol_options(ulonglong tls_version)
 {
    long tls_protocol_flags=
 #ifdef TLS1_3_VERSION
@@ -214,7 +214,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
              const char *cipher, my_bool is_client_method,
              enum enum_ssl_init_error *error,
              const char *crl_file, const char *crl_path,
-	           long tls_version)
+	           ulonglong tls_version)
 {
   DH *dh;
   struct st_VioSSLFd *ssl_fd;
@@ -386,7 +386,7 @@ new_VioSSLAcceptorFd(const char *key_file, const char *cert_file,
 		     const char *ca_file, const char *ca_path,
 		     const char *cipher, enum enum_ssl_init_error* error,
                      const char *crl_file, const char *crl_path,
-		     long tls_version)
+		     ulonglong tls_version)
 {
   struct st_VioSSLFd *ssl_fd;
   int verify= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;