X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_gcrypt.h;h=eec15c220f733affb590254ce038399c29aa5b6b;hb=4b9c63a36eded246ad9ef1ea0de0cf7b38d29ad9;hp=87fe46d85603fe5a5fffc42c1ac559b5f982c279;hpb=c3d58105344a51ff1e20c99ea4c6bd64e61f63be;p=vlc

diff --git a/include/vlc_gcrypt.h b/include/vlc_gcrypt.h
index 87fe46d856..eec15c220f 100644
--- a/include/vlc_gcrypt.h
+++ b/include/vlc_gcrypt.h
@@ -18,6 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+/**
+ * \file
+ * This file implements gcrypt support functions in vlc
+ */
+
+#include <errno.h>
+
 #ifdef LIBVLC_USE_PTHREAD
 /**
  * If possible, use gcrypt-provided thread implementation. This is so that
@@ -26,24 +33,20 @@
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 # define gcry_threads_vlc gcry_threads_pthread
 #else
+
 /**
  * gcrypt thread option VLC implementation
  */
 
 static int gcry_vlc_mutex_init( void **p_sys )
 {
-    int i_val;
     vlc_mutex_t *p_lock = (vlc_mutex_t *)malloc( sizeof( vlc_mutex_t ) );
-
     if( p_lock == NULL)
         return ENOMEM;
 
-    i_val = vlc_mutex_init( p_lock );
-    if( i_val )
-        free( p_lock );
-    else
-        *p_sys = p_lock;
-    return i_val;
+    vlc_mutex_init( p_lock );
+    *p_sys = p_lock;
+    return VLC_SUCCESS;
 }
 
 static int gcry_vlc_mutex_destroy( void **p_sys )
@@ -66,7 +69,7 @@ static int gcry_vlc_mutex_unlock( void **lock )
     return VLC_SUCCESS;
 }
 
-static struct gcry_thread_cbs gcry_threads_vlc =
+static const struct gcry_thread_cbs gcry_threads_vlc =
 {
     GCRY_THREAD_OPTION_USER,
     NULL,
@@ -82,7 +85,19 @@ static struct gcry_thread_cbs gcry_threads_vlc =
  */
 static inline void vlc_gcrypt_init (void)
 {
-    vlc_mutex_t *lock = var_AcquireMutex ("gcrypt_mutex");
-    gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
-    vlc_mutex_unlock (lock);
+    /* This would need a process-wide static mutex with all libraries linking
+     * to a given instance of libgcrypt. We cannot do this as we have different
+     * plugins linking with gcrypt, and some underlying libraries may use it
+     * behind our back. Only way is to always link gcrypt statically (ouch!) or
+     * have upstream gcrypt provide one shared object per threading system. */
+    static vlc_mutex_t lock = VLC_STATIC_MUTEX;
+    static bool done = false;
+
+    vlc_mutex_lock (&lock);
+    if (!done)
+    {
+        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
+        done = true;
+    }
+    vlc_mutex_unlock (&lock);
 }