diff options
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 2aba1f99f33..5af8c737889 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -104,11 +104,8 @@ my_bool net_flush(NET *net); #define CONNECT_TIMEOUT 0 #endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL) -#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X) -#endif - #include "client_settings.h" +#include <ssl_compat.h> #include <sql_common.h> #include <mysql/client_plugin.h> #include <my_context.h> @@ -1773,9 +1770,8 @@ mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused))) #if defined(HAVE_OPENSSL) -#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(HAVE_YASSL) +#ifdef HAVE_X509_check_host #include <openssl/x509v3.h> -#define HAVE_X509_check_host #endif static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const char **errptr) |