diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-30 16:39:20 +0200 |
| commit | 36e59752e7fc70bc5179a3d730b5ce3ee58e4e30 (patch) | |
| tree | 0d3e30ce973b2e1f044931c0eb1846d7192becda /include/ssl_compat.h | |
| parent | 7c0779da7c37f6ef6eff2f79dda6f1b0c57e3869 (diff) | |
| parent | 1dd3c8f8ba49ec06e550d7376d27ff05ce024bec (diff) | |
| download | mariadb-git-36e59752e7fc70bc5179a3d730b5ce3ee58e4e30.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include/ssl_compat.h')
| -rw-r--r-- | include/ssl_compat.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 54e80af769d..2777ae94527 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -27,7 +27,7 @@ #define HAVE_OPENSSL11 1 #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) #define ERR_remove_state(X) ERR_clear_error() -#define EVP_CIPHER_CTX_SIZE 168 +#define EVP_CIPHER_CTX_SIZE 176 #define EVP_MD_CTX_SIZE 48 #undef EVP_MD_CTX_init #define EVP_MD_CTX_init(X) do { bzero((X), EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) @@ -77,6 +77,10 @@ #define X509_get0_notAfter(X) X509_get_notAfter(X) #endif +#ifndef TLS1_3_VERSION +#define SSL_CTX_set_ciphersuites(X,Y) 0 +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ |