Skip to content

M
MariaDB
Commit 1ecd0e07 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

compilation fixes for new wolfssl

parent 3155a643
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
include/ssl_compat.h
View file @ 1ecd0e07
...@@ -79,7 +79,9 @@ ...@@ -79,7 +79,9 @@
#define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt)
#define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX)
#ifndef HAVE_WOLFSSL
#define EVP_MD_CTX_reset(X) EVP_MD_CTX_cleanup(X) #define EVP_MD_CTX_reset(X) EVP_MD_CTX_cleanup(X)
#endif
#define EVP_CIPHER_CTX_reset(X) EVP_CIPHER_CTX_cleanup(X) #define EVP_CIPHER_CTX_reset(X) EVP_CIPHER_CTX_cleanup(X)
#define X509_get0_notBefore(X) X509_get_notBefore(X) #define X509_get0_notBefore(X) X509_get_notBefore(X)
#define X509_get0_notAfter(X) X509_get_notAfter(X) #define X509_get0_notAfter(X) X509_get_notAfter(X)
......
include/violite.h
View file @ 1ecd0e07
...@@ -146,7 +146,9 @@ int vio_getnameinfo(const struct sockaddr *sa, ...@@ -146,7 +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
#include <openssl/ssl.h> #include <openssl/ssl.h>
#undef Timeval
#include <openssl/err.h> #include <openssl/err.h>
enum enum_ssl_init_error enum enum_ssl_init_error
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7