utils/yara/patches/010-libyara-Switch-to-OpenSSL-s-THREADID-API.patch

   1 From cd73c968e896b8ba364510abdcd3dcc63d017110 Mon Sep 17 00:00:00 2001
   2 From: Rosen Penev <rosenp@gmail.com>
   3 Date: Thu, 8 Nov 2018 14:57:49 -0800
   4 Subject: [PATCH] libyara: Switch to OpenSSL's THREADID API
   5
   6 The non THREADID API was deprecated back in OpenSSL 1.0.0
   7 ---
   8  libyara/libyara.c | 8 ++++----
   9  1 file changed, 4 insertions(+), 4 deletions(-)
  10
  11 diff --git a/libyara/libyara.c b/libyara/libyara.c
  12 index f05d1f9..6f20488 100644
  13 --- a/libyara/libyara.c
  14 +++ b/libyara/libyara.c
  15 @@ -87,9 +87,9 @@ char yr_altercase[256];
  16  static YR_MUTEX *openssl_locks;
  17
  18
  19 -static unsigned long _thread_id(void)
  20 +static void _thread_id(CRYPTO_THREADID *id)
  21  {
  22 -  return (unsigned long) yr_current_thread_id();
  23 +  CRYPTO_THREADID_set_numeric(id, (unsigned long) yr_current_thread_id());
  24  }
  25
  26
  27 @@ -155,7 +155,7 @@ YR_API int yr_initialize(void)
  28    for (i = 0; i < CRYPTO_num_locks(); i++)
  29      yr_mutex_create(&openssl_locks[i]);
  30
  31 -  CRYPTO_set_id_callback(_thread_id);
  32 +  CRYPTO_THREADID_set_callback(_thread_id);
  33    CRYPTO_set_locking_callback(_locking_function);
  34
  35    #elif defined(HAVE_WINCRYPT_H)
  36 @@ -226,7 +226,7 @@ YR_API int yr_finalize(void)
  37      yr_mutex_destroy(&openssl_locks[i]);
  38
  39    OPENSSL_free(openssl_locks);
  40 -  CRYPTO_set_id_callback(NULL);
  41 +  CRYPTO_THREADID_set_callback(NULL);
  42    CRYPTO_set_locking_callback(NULL);
  43
  44    #elif defined(HAVE_WINCRYPT_H)
  45 --
  46 2.19.1
  47