lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

100-use-1.0.2k-threadids.patch (727B)


      1 --- a/lib/crypto.c	2016-12-21 07:57:44.000000000 -0700
      2 +++ b/lib/crypto.c	2017-03-24 13:19:34.188259018 -0600
      3 @@ -51,11 +51,20 @@
      4      }
      5  }
      6  
      7 +#if OPENSSL_VERSION_NUMBER < 0x10000000
      8  static unsigned long
      9  ssl_thread_id(void)
     10  {
     11    return (unsigned long) get_thread_id();
     12  }
     13 +
     14 +#else
     15 +static void
     16 +ssl_thread_id2(CRYPTO_THREADID *id)
     17 +{
     18 +  CRYPTO_THREADID_set_numeric(id, get_thread_id());
     19 +}
     20 +#endif
     21  
     22  static void
     23  crypto_init_threading(void)
     24 @@ -68,7 +76,11 @@
     25      {
     26        g_static_mutex_init(&ssl_locks[i]);
     27      }
     28 +#if OPENSSL_VERSION_NUMBER < 0x10000000
     29    CRYPTO_set_id_callback(ssl_thread_id);
     30 +#else
     31 +  CRYPTO_THREADID_set_callback(ssl_thread_id2);
     32 +#endif
     33    CRYPTO_set_locking_callback(ssl_locking_callback);
     34  }
     35