From 40ba118936874665b6529e5da523c6f8b3285917 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Sun, 29 Mar 2020 03:20:59 +0400 Subject: [PATCH] [sofia-sip] Fix use of deprecated CRYPTO_set_id_callback(). --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 0a25dc4ef5..16917b0159 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Mon Mar 16 18:37:11 UTC 2020 +Sat Mar 28 10:36:01 UTC 2020 diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c index c004781e12..0c2709ea98 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/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()); }