[sofia-sip] Fix use of deprecated CRYPTO_set_id_callback().

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 0a25dc4ef5b5a8b0a9f689bc7f10bb410cfd1465..16917b0159be0e256c3cfa1ded9ca3eba1da1c7b 100644 (file)
--- 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 c004781e12cfd518d17c223c6f5b1af5786e7aee..0c2709ea98d75cdb2fb4e5883982240d096b7327 100644 (file)
--- 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());
 }