diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-05 14:04:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-06 11:45:23 +0100 |
| commit | a90da6e0537b3bd5b3aa19ba8dfca340e66c0cd6 (patch) | |
| tree | 54015a8521b0af63666f278d1fbd20ea6dc41c70 | |
| parent | db5f743c31135d9dce29cc578837081e8b7b04da (diff) | |
| download | mariadb-git-a90da6e0537b3bd5b3aa19ba8dfca340e66c0cd6.tar.gz | |
MDEV-9314 fatal build error: viosslfactories.c:58:5: error: dereferencing pointer to incomplete type ‘DH {aka struct dh_st}
fixes for openssl that was built with -DOPENSSL_NO_DEPRECATED
| -rw-r--r-- | sql/mysqld.cc | 8 | ||||
| -rw-r--r-- | vio/viosslfactories.c | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 731614e2b15..45fb49f9cd9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1254,7 +1254,6 @@ static openssl_lock_t *openssl_dynlock_create(const char *, int); static void openssl_dynlock_destroy(openssl_lock_t *, const char *, int); static void openssl_lock_function(int, int, const char *, int); static void openssl_lock(int, openssl_lock_t *, const char *, int); -static unsigned long openssl_id_function(); #endif char *des_key_file; #ifndef EMBEDDED_LIBRARY @@ -3984,7 +3983,6 @@ static int init_thread_environment() CRYPTO_set_dynlock_destroy_callback(openssl_dynlock_destroy); CRYPTO_set_dynlock_lock_callback(openssl_lock); CRYPTO_set_locking_callback(openssl_lock_function); - CRYPTO_set_id_callback(openssl_id_function); #endif #endif mysql_rwlock_init(key_rwlock_LOCK_sys_init_connect, &LOCK_sys_init_connect); @@ -4021,12 +4019,6 @@ static int init_thread_environment() #if defined(HAVE_OPENSSL) && !defined(HAVE_YASSL) -static unsigned long openssl_id_function() -{ - return (unsigned long) pthread_self(); -} - - static openssl_lock_t *openssl_dynlock_create(const char *file, int line) { openssl_lock_t *lock= new openssl_lock_t; diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index c889b90a2e2..11d01ea534d 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -17,6 +17,10 @@ #include "vio_priv.h" #ifdef HAVE_OPENSSL +#ifndef HAVE_YASSL +#include <openssl/dh.h> +#include <openssl/bn.h> +#endif static my_bool ssl_algorithms_added = FALSE; static my_bool ssl_error_strings_loaded= FALSE; |