[Spice-commits] server/reds.c

[Frediano Ziglio]

 server/reds.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 319a31ad81ff947684bd7cd39b60dcd80ed8b219
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Aug 11 14:06:53 2016 +0100

    OpenSSL from 1.1.0 is thread safe by default
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Pavel Grunt <pgrunt at redhat.com>

diff --git a/server/reds.c b/server/reds.c
index f74c8d3..32068ac 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2771,6 +2771,7 @@ static int ssl_password_cb(char *buf, int size, int flags, void *userdata)
     return (strlen(pass));
 }
 
+#if OPENSSL_VERSION_NUMBER < 0x1010000FL
 static unsigned long pthreads_thread_id(void)
 {
     unsigned long ret;
@@ -2808,6 +2809,11 @@ static void openssl_thread_setup(void)
     CRYPTO_set_id_callback(pthreads_thread_id);
     CRYPTO_set_locking_callback(pthreads_locking_callback);
 }
+#else
+static inline void openssl_thread_setup(void)
+{
+}
+#endif
 
 static gpointer openssl_global_init(gpointer arg)
 {