WolfSSL fixes

remove Timeval workaround (not needed anymore). add template workaround. comments.
MariaDB · May 8, 2020 · 5b0df74 · 5b0df74
1 parent 403dc75
commit 5b0df74
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in
@@ -20,6 +20,7 @@
 #define WOLFSSL_AES_COUNTER
 #define NO_WOLFSSL_STUB
 #define OPENSSL_ALL
+#undef WOLFSSL_ALLOW_TLSV10 /* see https://github.com/wolfSSL/wolfssl/issues/2960 */
 #define NO_OLD_TIMEVAL_NAME
 /*
   FP_MAX_BITS is set high solely to satisfy ssl_8k_key.test

diff --git a/include/violite.h b/include/violite.h
@@ -146,9 +146,9 @@ int vio_getnameinfo(const struct sockaddr *sa,
 /* Set yaSSL to use same type as MySQL do for socket handles */
 typedef my_socket YASSL_SOCKET_T;
 #define YASSL_SOCKET_T_DEFINED
-#define Timeval WOLFSSL_Timeval
+#define template _template /* bug in WolfSSL 4.4.0, see also my_crypt.cc */
 #include <openssl/ssl.h>
-#undef Timeval
+#undef template
 #include <openssl/err.h>
 #ifdef DEPRECATED
 #undef DEPRECATED

diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
@@ -74,8 +74,8 @@ sub skip_combinations {
   $skip{'main/ssl_verify_ip.test'} = 'x509v3 support required'
     unless $openssl_ver ge "1.0.2";
 
-  $skip{'main/tls_version1.test'} = 'No TLSv1.0 support'
-    if $ssl_lib =~ /WolfSSL/;
+  $skip{'main/tls_version1.test'} = 'https://github.com/wolfSSL/wolfssl/issues/2960'
+    if $ssl_lib =~ /WolfSSL 4.4.0/;
 
   %skip;
 }

diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc
@@ -18,7 +18,9 @@
 #include <my_global.h>
 #include <string.h>
 
+#define template _template /* bug in WolfSSL 4.4.0, see also violite.h */
 #include <openssl/evp.h>
+#undef template
 #include <openssl/aes.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>