kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Andrey Volk 2020-03-29 03:20:59 +04:00
parent 865de72cee
commit 40ba118936
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Mon Mar 16 18:37:11 UTC 2020 Sat Mar 28 10:36:01 UTC 2020

8
libs/sofia-sip/libsofia-sip-ua/tport/ws.c
View File

@ -42,7 +42,7 @@ void deinit_ssl(void)
} }
#else #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 void pthreads_locking_callback(int mode, int type, const char *file, int line);
static pthread_mutex_t *lock_cs; static pthread_mutex_t *lock_cs;
@ -62,7 +62,7 @@ static void thread_setup(void)
pthread_mutex_init(&(lock_cs[i]), NULL); 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); 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());
} }