1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WolfSSL fixes

Browse Source 
remove Timeval workaround (not needed anymore).
add template workaround.
comments.
This commit is contained in:
Sergei Golubchik 2020-05-08 12:31:33 +02:00
parent 403dc759d0
commit 5b0df7433d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extra/wolfssl/user_settings.h.in
View File

@ -20,6 +20,7 @@
#define WOLFSSL_AES_COUNTER #define WOLFSSL_AES_COUNTER
#define NO_WOLFSSL_STUB #define NO_WOLFSSL_STUB
#define OPENSSL_ALL #define OPENSSL_ALL
#undef WOLFSSL_ALLOW_TLSV10 /* see https://github.com/wolfSSL/wolfssl/issues/2960 */
#define NO_OLD_TIMEVAL_NAME #define NO_OLD_TIMEVAL_NAME
/* /*
FP_MAX_BITS is set high solely to satisfy ssl_8k_key.test FP_MAX_BITS is set high solely to satisfy ssl_8k_key.test

4
include/violite.h
View File

@ -146,9 +146,9 @@ int vio_getnameinfo(const struct sockaddr *sa,
/* Set yaSSL to use same type as MySQL do for socket handles */ /* Set yaSSL to use same type as MySQL do for socket handles */
typedef my_socket YASSL_SOCKET_T; typedef my_socket YASSL_SOCKET_T;
#define YASSL_SOCKET_T_DEFINED #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> #include <openssl/ssl.h>
#undef Timeval #undef template
#include <openssl/err.h> #include <openssl/err.h>
#ifdef DEPRECATED #ifdef DEPRECATED
#undef DEPRECATED #undef DEPRECATED

4
mysql-test/suite.pm
View File

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

2
mysys_ssl/my_crypt.cc
View File

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