diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
| commit | 4771ae4b22d2bdef0aafc563570c71d4636a2493 (patch) | |
| tree | d115bd7c68b1e6feab68ff6fcd547e0c86c79296 /include/ssl_compat.h | |
| parent | 60f51af755ea9d07c20a596ba21de184816fa265 (diff) | |
| parent | 0c25e58db6b045df92c209d396031cac5b528bbf (diff) | |
| download | mariadb-git-4771ae4b22d2bdef0aafc563570c71d4636a2493.tar.gz | |
Merge branch 'github/10.1' into 10.2
Diffstat (limited to 'include/ssl_compat.h')
| -rw-r--r-- | include/ssl_compat.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 568af6e1db4..54e80af769d 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -51,14 +51,6 @@ #define HAVE_OPENSSL10 1 #define SSL_LIBRARY SSLeay_version(SSLEAY_VERSION) -/* - Unfortunately RAND_bytes manual page does not provide any guarantees - in relation to blocking behavior. Here we explicitly use SSLeay random - instead of whatever random engine is currently set in OpenSSL. That way - we are guaranteed to have a non-blocking random. -*/ -#define RAND_OpenSSL() RAND_SSLeay() - #ifdef HAVE_ERR_remove_thread_state #define ERR_remove_state(X) ERR_remove_thread_state(NULL) #endif /* HAVE_ERR_remove_thread_state */ |