[core,mod_verto,mod_xml_rpc] Fix use of deprecated CRYPTO_set_id_callback().

diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c
index f33ce57239301077a2f4d063865153c6e3b6d7d2..be2fd8296c2a280787e084ae54bb3d2472b87bd7 100644 (file)
--- a/src/mod/endpoints/mod_verto/ws.c
+++ b/src/mod/endpoints/mod_verto/ws.c
@@ -42,7 +42,7 @@ void deinit_ssl(void)
 }
 
 #else
-static unsigned long pthreads_thread_id(void);
+static void pthreads_thread_id(CRYPTO_THREADID *id);
 static void pthreads_locking_callback(int mode, int type, const char *file, int line);
 
 static pthread_mutex_t *lock_cs;
@@ -62,7 +62,7 @@ static void thread_setup(void)
                pthread_mutex_init(&(lock_cs[i]), NULL);
        }
 
-       CRYPTO_set_id_callback(pthreads_thread_id);
+       CRYPTO_THREADID_set_callback(pthreads_thread_id);
        CRYPTO_set_locking_callback(pthreads_locking_callback);
 }
 
@@ -93,9 +93,9 @@ static void pthreads_locking_callback(int mode, int type, const char *file, int
 
 
 
-static unsigned long pthreads_thread_id(void)
+static void pthreads_thread_id(CRYPTO_THREADID *id)
 {
-       return (unsigned long) pthread_self();
+       CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self());
 }
 
 

diff --git a/src/mod/xml_int/mod_xml_rpc/ws.c b/src/mod/xml_int/mod_xml_rpc/ws.c
index a5ad9c7a3bfc5df8996032b7d9760dd1dcf1be7c..b660b644f664871502d31409fc0e53d7137b6394 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/ws.c
+++ b/src/mod/xml_int/mod_xml_rpc/ws.c
@@ -19,7 +19,7 @@ void deinit_ssl(void)
 }
 
 #else
-static unsigned long pthreads_thread_id(void);
+static void pthreads_thread_id(CRYPTO_THREADID *id);
 static void pthreads_locking_callback(int mode, int type, const char *file, int line);
 
 static pthread_mutex_t *lock_cs;
@@ -39,7 +39,7 @@ static void thread_setup(void)
                pthread_mutex_init(&(lock_cs[i]), NULL);
        }
 
-       CRYPTO_set_id_callback(pthreads_thread_id);
+       CRYPTO_THREADID_set_callback(pthreads_thread_id);
        CRYPTO_set_locking_callback(pthreads_locking_callback);
 }
 
@@ -70,9 +70,9 @@ static void pthreads_locking_callback(int mode, int type, const char *file, int
 
 
 
-static unsigned long pthreads_thread_id(void)
+static void pthreads_thread_id(CRYPTO_THREADID *id)
 {
-       return (unsigned long) pthread_self();
+       CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self());
 }
 
 

diff --git a/src/switch_core_cert.c b/src/switch_core_cert.c
index 0cc992b9ed23ab50bf8ca74a97fbf4c7cdb0cbbd..393baa55a968bb1588a5525518f8c2af840a1e0e 100644 (file)
--- a/src/switch_core_cert.c
+++ b/src/switch_core_cert.c
@@ -46,9 +46,9 @@ static inline void switch_ssl_ssl_lock_callback(int mode, int type, char *file,
        }
 }
 
-static inline unsigned long switch_ssl_ssl_thread_id(void)
+static inline void switch_ssl_ssl_thread_id(CRYPTO_THREADID *id)
 {
-       return (unsigned long) switch_thread_self();
+       CRYPTO_THREADID_set_numeric(id, (unsigned long)switch_thread_self());
 }
 
 SWITCH_DECLARE(void) switch_ssl_init_ssl_locks(void)
@@ -69,7 +69,7 @@ SWITCH_DECLARE(void) switch_ssl_init_ssl_locks(void)
                        switch_assert(ssl_mutexes[i] != NULL);
                }
 
-               CRYPTO_set_id_callback(switch_ssl_ssl_thread_id);
+               CRYPTO_THREADID_set_callback(switch_ssl_ssl_thread_id);
                CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))switch_ssl_ssl_lock_callback);
        }