* Merged trunk changes r9181:9183 to 0.8.1 branch.

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 1ef33f28a24402d09630399b59c0db34811b378f..c0f6bf9cc9d1094e7ea572ad9f3214665d8d4e24 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -36,11 +36,12 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>
+#include <errno.h>
 #include <vlc/vlc.h>
 
 #include "vlc_tls.h"
 
-
+#include <gcrypt.h>
 #include <gnutls/gnutls.h>
 
 #define DH_BITS 1024
@@ -383,6 +384,56 @@ gnutls_ServerCreate( tls_t *p_this, const char *psz_cert_path,
 }
 
 
+/*
+ * gcrypt thread option VLC implementation
+ */
+vlc_object_t *__p_gcry_data;
+
+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_gcry_data, p_lock);
+    if (i_val)
+        free (p_lock);
+    else
+        *p_sys = p_lock;
+    return i_val;
+}
+
+static int gcry_vlc_mutex_destroy (void **p_sys)
+{
+    int i_val;
+    vlc_mutex_t *p_lock = (vlc_mutex_t *)*p_sys;
+
+    i_val = vlc_mutex_destroy (p_lock);
+    free (p_lock);
+    return i_val;
+}
+
+static int gcry_vlc_mutex_lock (void **p_sys)
+{
+    return vlc_mutex_lock ((vlc_mutex_t *)*p_sys);
+}
+
+static int gcry_vlc_mutex_unlock (void **lock)
+{
+    return vlc_mutex_unlock ((vlc_mutex_t *)*lock);
+}
+
+static struct gcry_thread_cbs gcry_threads_vlc =                        
+{
+    GCRY_THREAD_OPTION_USER,
+    NULL,
+    gcry_vlc_mutex_init,
+    gcry_vlc_mutex_destroy,
+    gcry_vlc_mutex_lock,
+    gcry_vlc_mutex_unlock
+};
 
 
 static int
@@ -400,15 +451,24 @@ Open( vlc_object_t *p_this )
     var_Create( p_this->p_libvlc, "gnutls_count", VLC_VAR_INTEGER );
     var_Get( p_this->p_libvlc, "gnutls_count", &count);
 
-    /* FIXME: should check version number */
     if( count.i_int == 0)
     {
+        __p_gcry_data = p_this;
+
+        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
         if( gnutls_global_init( ) )
         {
             msg_Warn( p_this, "cannot initialize GNUTLS" );
             vlc_mutex_unlock( lock.p_address);
             return VLC_EGENERIC;
         }
+        if( gnutls_check_version( "1.0.0" ) == NULL )
+        {
+            gnutls_global_deinit( );
+            vlc_mutex_unlock( lock.p_address);
+            msg_Err( p_this, "unsupported GNUTLS version" );
+            return VLC_EGENERIC;
+        }
         msg_Dbg( p_this, "GNUTLS initialized" );
     }