diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-08 12:31:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-08 12:49:53 +0200 |
| commit | 5b0df7433d36cc0fa220f3593382908198ad87a3 (patch) | |
| tree | a89a0f3ba90107ed240ba19bae3c71ac8d493dde | |
| parent | 403dc759d0bc5d045da06fb326cdf59b23084953 (diff) | |
| download | mariadb-git-5b0df7433d36cc0fa220f3593382908198ad87a3.tar.gz | |
WolfSSL fixes
remove Timeval workaround (not needed anymore).
add template workaround.
comments.
| -rw-r--r-- | extra/wolfssl/user_settings.h.in | 1 | ||||
| -rw-r--r-- | include/violite.h | 4 | ||||
| -rw-r--r-- | mysql-test/suite.pm | 4 | ||||
| -rw-r--r-- | mysys_ssl/my_crypt.cc | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in index de9d9b5a8d9..98f05079e05 100644 --- 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 index 3a163d45976..34f59f2e598 100644 --- 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 index 4cf55e3eac8..8ff2e95c083 100644 --- 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 index 02770644259..e512eee9066 100644 --- 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> |