Use proper callback for setting thread ID in OpenSSL

emmax86 · emmax86 · commit 6cdcfd8a5b99 · 2018-09-25T15:13:12.000-07:00
diff --git a/generate/templates/templates/nodegit.cc b/generate/templates/templates/nodegit.cc
@@ -105,8 +105,8 @@ void OpenSSL_LockingCallback(int mode, int type, const char *, int) {
   }
 }
 
-unsigned long OpenSSL_IDCallback() {
-  return (unsigned long)uv_thread_self();
+void OpenSSL_IDCallback(CRYPTO_THREADID *id) {
+  CRYPTO_THREADID_set_numeric(id, (unsigned long)uv_thread_self());
 }
 
 void OpenSSL_ThreadSetup() {
@@ -117,7 +117,7 @@ void OpenSSL_ThreadSetup() {
   }
 
   CRYPTO_set_locking_callback(OpenSSL_LockingCallback);
-  CRYPTO_set_id_callback(OpenSSL_IDCallback);
+  CRYPTO_THREADID_set_callback(OpenSSL_IDCallback);
 }
 
 ThreadPool libgit2ThreadPool(10, uv_default_loop());

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@ void OpenSSL_LockingCallback(int mode, int type, const char *, int) {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`-unsigned long OpenSSL_IDCallback() {`
`109`		`- return (unsigned long)uv_thread_self();`
	`108`	`+void OpenSSL_IDCallback(CRYPTO_THREADID *id) {`
	`109`	`+ CRYPTO_THREADID_set_numeric(id, (unsigned long)uv_thread_self());`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`void OpenSSL_ThreadSetup() {`
`@@ -117,7 +117,7 @@ void OpenSSL_ThreadSetup() {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`CRYPTO_set_locking_callback(OpenSSL_LockingCallback);`
`120`		`- CRYPTO_set_id_callback(OpenSSL_IDCallback);`
	`120`	`+ CRYPTO_THREADID_set_callback(OpenSSL_IDCallback);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`ThreadPool libgit2ThreadPool(10, uv_default_loop());`