X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Fgnutls.c;h=42e3973f87700a570d6fa2a40e140771cd353486;hb=edff9427d9b185d5c5e985650055044dcd49f9f3;hp=34e454b091f5b5e1b5f331945c93651945f0d1df;hpb=faad88674b6c708e83937a51f694e2a2f558a6f4;p=vlc diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 34e454b091..42e3973f87 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -1,10 +1,10 @@ /***************************************************************************** - * tls.c + * gnutls.c ***************************************************************************** - * Copyright (C) 2004 VideoLAN - * $Id: httpd.c 8263 2004-07-24 09:06:58Z courmisch $ + * Copyright (C) 2004-2006 Rémi Denis-Courmont + * $Id$ * - * Authors: Remi Denis-Courmont + * Authors: Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,32 +18,40 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/* - * TODO: - * - fix FIXMEs, - * - client side stuff, - * - server-side client cert validation, - * - client-side server cert validation (?). - */ - - /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include + #include +#include +#include + +#include +#include +#ifdef HAVE_DIRENT_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +# ifdef HAVE_UNISTD_H +# include +# endif +#endif + #include "vlc_tls.h" +#include #include #include +#include -#define DH_BITS 1024 - +#define DH_BITS 1024 +#define CACHE_EXPIRATION 3600 +#define CACHE_SIZE 64 /***************************************************************************** * Module descriptor @@ -53,32 +61,84 @@ static void Close( vlc_object_t * ); #define DH_BITS_TEXT N_("Diffie-Hellman prime bits") #define DH_BITS_LONGTEXT N_( \ - "Allows you to modify the Diffie-Hellman prime's number of bits " \ - "(used for TLS or SSL-based server-side encryption)." ) + "This allows you to modify the Diffie-Hellman prime's number of bits, " \ + "used for TLS or SSL-based server-side encryption. This is generally " \ + "not needed." ) + +#define CACHE_EXPIRATION_TEXT N_("Expiration time for resumed TLS sessions") +#define CACHE_EXPIRATION_LONGTEXT N_( \ + "It is possible to cache the resumed TLS sessions. This is the expiration "\ + "time of the sessions stored in this cache, in seconds." ) + +#define CACHE_SIZE_TEXT N_("Number of resumed TLS sessions") +#define CACHE_SIZE_LONGTEXT N_( \ + "This is the maximum number of resumed TLS sessions that " \ + "the cache will hold." ) + +#define CHECK_CERT_TEXT N_("Check TLS/SSL server certificate validity") +#define CHECK_CERT_LONGTEXT N_( \ + "This ensures that the server certificate is valid " \ + "(i.e. signed by an approved Certification Authority)." ) + +#define CHECK_HOSTNAME_TEXT N_("Check TLS/SSL server hostname in certificate") +#define CHECK_HOSTNAME_LONGTEXT N_( \ + "This ensures that the server hostname in certificate matches the " \ + "requested host name." ) vlc_module_begin(); + set_shortname( "GnuTLS" ); set_description( _("GnuTLS TLS encryption layer") ); set_capability( "tls", 1 ); set_callbacks( Open, Close ); set_category( CAT_ADVANCED ); set_subcategory( SUBCAT_ADVANCED_MISC ); - add_integer( "dh-bits", DH_BITS, NULL, DH_BITS_TEXT, + add_bool( "tls-check-cert", VLC_TRUE, NULL, CHECK_CERT_TEXT, + CHECK_CERT_LONGTEXT, VLC_FALSE ); + add_bool( "tls-check-hostname", VLC_TRUE, NULL, CHECK_HOSTNAME_TEXT, + CHECK_HOSTNAME_LONGTEXT, VLC_FALSE ); + + add_integer( "gnutls-dh-bits", DH_BITS, NULL, DH_BITS_TEXT, DH_BITS_LONGTEXT, VLC_TRUE ); + add_integer( "gnutls-cache-expiration", CACHE_EXPIRATION, NULL, + CACHE_EXPIRATION_TEXT, CACHE_EXPIRATION_LONGTEXT, VLC_TRUE ); + add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT, + CACHE_SIZE_LONGTEXT, VLC_TRUE ); vlc_module_end(); +#define MAX_SESSION_ID 32 +#define MAX_SESSION_DATA 1024 + +typedef struct saved_session_t +{ + char id[MAX_SESSION_ID]; + char data[MAX_SESSION_DATA]; + + unsigned i_idlen; + unsigned i_datalen; +} saved_session_t; + typedef struct tls_server_sys_t { - gnutls_certificate_credentials x509_cred; - gnutls_dh_params dh_params; + gnutls_certificate_credentials x509_cred; + gnutls_dh_params dh_params; + + struct saved_session_t *p_cache; + struct saved_session_t *p_store; + int i_cache_size; + vlc_mutex_t cache_lock; + + int (*pf_handshake2)( tls_session_t * ); } tls_server_sys_t; typedef struct tls_session_sys_t { gnutls_session session; + char *psz_hostname; + vlc_bool_t b_handshaked; } tls_session_sys_t; @@ -89,11 +149,44 @@ typedef struct tls_client_sys_t } tls_client_sys_t; -/***************************************************************************** - * tls_Send: - ***************************************************************************** +static int gnutls_Error (vlc_object_t *obj, int val) +{ + switch (val) + { + case GNUTLS_E_AGAIN: +#if ! defined(WIN32) + errno = EAGAIN; + break; +#endif + /* WinSock does not return EAGAIN, return EINTR instead */ + + case GNUTLS_E_INTERRUPTED: +#if defined(WIN32) + WSASetLastError(WSAEINTR); +#else + errno = EINTR; +#endif + break; + + default: + msg_Err (obj, "%s", gnutls_strerror (val)); +#ifdef DEBUG + if (!gnutls_error_is_fatal (val)) + msg_Err (obj, "Error above should be handled"); +#endif +#if defined(WIN32) + WSASetLastError(WSAECONNRESET); +#else + errno = ECONNRESET; +#endif + } + return -1; +} + + +/** * Sends data through a TLS session. - *****************************************************************************/ + */ static int gnutls_Send( void *p_session, const void *buf, int i_length ) { @@ -103,16 +196,13 @@ gnutls_Send( void *p_session, const void *buf, int i_length ) p_sys = (tls_session_sys_t *)(((tls_session_t *)p_session)->p_sys); val = gnutls_record_send( p_sys->session, buf, i_length ); - /* TODO: handle fatal error */ - return val < 0 ? -1 : val; + return (val < 0) ? gnutls_Error ((vlc_object_t *)p_session, val) : val; } -/***************************************************************************** - * tls_Recv: - ***************************************************************************** +/** * Receives data through a TLS session. - *****************************************************************************/ + */ static int gnutls_Recv( void *p_session, void *buf, int i_length ) { @@ -122,8 +212,7 @@ gnutls_Recv( void *p_session, void *buf, int i_length ) p_sys = (tls_session_sys_t *)(((tls_session_t *)p_session)->p_sys); val = gnutls_record_recv( p_sys->session, buf, i_length ); - /* TODO: handle fatal error */ - return val < 0 ? -1 : val; + return (val < 0) ? gnutls_Error ((vlc_object_t *)p_session, val) : val; } @@ -136,49 +225,199 @@ gnutls_Recv( void *p_session, void *buf, int i_length ) * needed, 2 if more would-be blocking send is required. *****************************************************************************/ static int -gnutls_SessionContinueHandshake( tls_session_t *p_session) +gnutls_ContinueHandshake( tls_session_t *p_session) { tls_session_sys_t *p_sys; int val; p_sys = (tls_session_sys_t *)(p_session->p_sys); - /* TODO: handle fatal error */ +#ifdef WIN32 + WSASetLastError( 0 ); +#endif val = gnutls_handshake( p_sys->session ); if( ( val == GNUTLS_E_AGAIN ) || ( val == GNUTLS_E_INTERRUPTED ) ) return 1 + gnutls_record_get_direction( p_sys->session ); if( val < 0 ) { - gnutls_deinit( p_sys->session ); - msg_Err( p_session->p_tls, "TLS handshake failed : %s", +#ifdef WIN32 + msg_Dbg( p_session, "Winsock error %d", WSAGetLastError( ) ); +#endif + msg_Err( p_session, "TLS handshake error: %s", gnutls_strerror( val ) ); - free( p_sys ); - free( p_session ); + p_session->pf_close( p_session ); return -1; } + p_sys->b_handshaked = VLC_TRUE; + return 0; +} + + +typedef struct +{ + int flag; + const char *msg; +} error_msg_t; + +static const error_msg_t cert_errors[] = +{ + { GNUTLS_CERT_INVALID, + "Certificate could not be verified" }, + { GNUTLS_CERT_REVOKED, + "Certificate was revoked" }, + { GNUTLS_CERT_SIGNER_NOT_FOUND, + "Certificate's signer was not found" }, + { GNUTLS_CERT_SIGNER_NOT_CA, + "Certificate's signer is not a CA" }, + { GNUTLS_CERT_INSECURE_ALGORITHM, + "Insecure certificate signature algorithm" }, + { 0, NULL } +}; + + +static int +gnutls_HandshakeAndValidate( tls_session_t *session ) +{ + int val = gnutls_ContinueHandshake( session ); + if( val ) + return val; + + tls_session_sys_t *p_sys = (tls_session_sys_t *)(session->p_sys); + + /* certificates chain verification */ + unsigned status; + val = gnutls_certificate_verify_peers2( p_sys->session, &status ); + + if( val ) + { + msg_Err( session, "Certificate verification failed: %s", + gnutls_strerror( val ) ); + goto error; + } + + if( status ) + { + msg_Err( session, "TLS session: access denied" ); + for( const error_msg_t *e = cert_errors; e->flag; e++ ) + { + if( status & e->flag ) + { + msg_Err( session, "%s", e->msg ); + status &= ~e->flag; + } + } + + if( status ) + msg_Err( session, + "unknown certificate error (you found a bug in VLC)" ); + + goto error; + } + + /* certificate (host)name verification */ + const gnutls_datum *data = gnutls_certificate_get_peers( p_sys->session, + &(size_t){ 0 } ); + if( data == NULL ) + { + msg_Err( session, "Peer certificate not available" ); + goto error; + } + + gnutls_x509_crt cert; + val = gnutls_x509_crt_init( &cert ); + if( val ) + { + msg_Err( session, "x509 fatal error: %s", gnutls_strerror( val ) ); + goto error; + } + + val = gnutls_x509_crt_import( cert, data, GNUTLS_X509_FMT_DER ); + if( val ) + { + msg_Err( session, "Certificate import error: %s", + gnutls_strerror( val ) ); + goto crt_error; + } + + if( p_sys->psz_hostname != NULL ) + { + if ( !gnutls_x509_crt_check_hostname( cert, p_sys->psz_hostname ) ) + { + msg_Err( session, "Certificate does not match \"%s\"", + p_sys->psz_hostname ); + goto crt_error; + } + } + else + msg_Warn( session, "Certificate and hostname were not verified" ); + + if( gnutls_x509_crt_get_expiration_time( cert ) < time( NULL ) ) + { + msg_Err( session, "Certificate expired" ); + goto crt_error; + } + + if( gnutls_x509_crt_get_activation_time( cert ) > time ( NULL ) ) + { + msg_Err( session, "Certificate not yet valid" ); + goto crt_error; + } + + gnutls_x509_crt_deinit( cert ); + msg_Dbg( session, "TLS/x509 certificate verified" ); return 0; + +crt_error: + gnutls_x509_crt_deinit( cert ); +error: + session->pf_close( session ); + return -1; } +/** + * Starts negociation of a TLS session. + * + * @param fd stream socket already connected with the peer. + * @param psz_hostname if not NULL, hostname to mention as a Server Name. + * + * @return -1 on error (you need not and must not call tls_SessionClose), + * 0 on succesful handshake completion, 1 if more would-be blocking recv is + * needed, 2 if more would-be blocking send is required. + */ static int -gnutls_SessionHandshake( tls_session_t *p_session, int fd ) +gnutls_BeginHandshake( tls_session_t *p_session, int fd, + const char *psz_hostname ) { tls_session_sys_t *p_sys; p_sys = (tls_session_sys_t *)(p_session->p_sys); - gnutls_transport_set_ptr (p_sys->session, (gnutls_transport_ptr)fd); + gnutls_transport_set_ptr (p_sys->session, (gnutls_transport_ptr)(intptr_t)fd); - return gnutls_SessionContinueHandshake( p_session ); -} + if( psz_hostname != NULL ) + { + gnutls_server_name_set( p_sys->session, GNUTLS_NAME_DNS, psz_hostname, + strlen( psz_hostname ) ); + if (var_CreateGetBool (p_session, "tls-check-hostname")) + { + p_sys->psz_hostname = strdup( psz_hostname ); + if( p_sys->psz_hostname == NULL ) + { + p_session->pf_close( p_session ); + return -1; + } + } + } + return p_session->pf_handshake2( p_session ); +} -/***************************************************************************** - * tls_SessionClose: - ***************************************************************************** +/** * Terminates TLS session and releases session data. - *****************************************************************************/ + * You still have to close the socket yourself. + */ static void gnutls_SessionClose( tls_session_t *p_session ) { @@ -186,418 +425,777 @@ gnutls_SessionClose( tls_session_t *p_session ) p_sys = (tls_session_sys_t *)(p_session->p_sys); - /* On the client-side, credentials are re-allocated per session */ - if( p_session->p_server == NULL ) - gnutls_certificate_free_credentials( ((tls_client_sys_t *)p_sys) - ->x509_cred ); - - gnutls_bye( p_sys->session, GNUTLS_SHUT_WR ); + if( p_sys->b_handshaked == VLC_TRUE ) + gnutls_bye( p_sys->session, GNUTLS_SHUT_WR ); gnutls_deinit( p_sys->session ); + + if( p_sys->psz_hostname != NULL ) + free( p_sys->psz_hostname ); + + vlc_object_detach( p_session ); + vlc_object_destroy( p_session ); + free( p_sys ); - free( p_session ); } -/***************************************************************************** - * tls_ClientCreate: - ***************************************************************************** - * Initializes client-side TLS session data. - *****************************************************************************/ -static tls_session_t * -gnutls_ClientCreate( tls_t *p_tls, const char *psz_ca_path ) +typedef int (*tls_prio_func) (gnutls_session_t, const int *); + +static int +gnutls_SetPriority (vlc_object_t *restrict obj, const char *restrict name, + tls_prio_func func, gnutls_session_t session, + const int *restrict values) { - tls_session_t *p_session; - tls_client_sys_t *p_sys; - int i_val; - const int cert_type_priority[3] = + int val = func (session, values); + if (val < 0) + { + msg_Err (obj, "cannot set %s priorities: %s", name, + gnutls_strerror (val)); + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + + +static int +gnutls_SessionPrioritize (vlc_object_t *obj, gnutls_session_t session) +{ + /* Note that ordering matters (on the client side) */ + static const int protos[] = + { + GNUTLS_TLS1_1, + GNUTLS_TLS1_0, + GNUTLS_SSL3, + 0 + }; + static const int comps[] = + { + GNUTLS_COMP_DEFLATE, + GNUTLS_COMP_NULL, + 0 + }; + static const int macs[] = + { + GNUTLS_MAC_SHA1, + GNUTLS_MAC_RMD160, // RIPEMD + GNUTLS_MAC_MD5, + //GNUTLS_MAC_MD2, + //GNUTLS_MAC_NULL, + 0 + }; + static const int ciphers[] = + { + GNUTLS_CIPHER_AES_256_CBC, + GNUTLS_CIPHER_AES_128_CBC, + GNUTLS_CIPHER_3DES_CBC, + GNUTLS_CIPHER_ARCFOUR_128, + //GNUTLS_CIPHER_DES_CBC, + //GNUTLS_CIPHER_ARCFOUR_40, + //GNUTLS_CIPHER_RC2_40_CBC, + //GNUTLS_CIPHER_NULL, + 0 + }; + static const int kx[] = + { + GNUTLS_KX_DHE_RSA, + GNUTLS_KX_DHE_DSS, + GNUTLS_KX_RSA, + //GNUTLS_KX_RSA_EXPORT, + //GNUTLS_KX_DHE_PSK, TODO + //GNUTLS_KX_PSK, TODO + //GNUTLS_KX_SRP_RSA, TODO + //GNUTLS_KX_SRP_DSS, TODO + //GNUTLS_KX_SRP, TODO + //GNUTLS_KX_ANON_DH, + 0 + }; + static const int cert_types[] = { GNUTLS_CRT_X509, + //GNUTLS_CRT_OPENPGP, TODO 0 }; - p_sys = (tls_client_sys_t *)malloc( sizeof(struct tls_client_sys_t) ); - if( p_sys == NULL ) - return NULL; + int val = gnutls_set_default_priority (session); + if (val < 0) + { + msg_Err (obj, "cannot set default TLS priorities: %s", + gnutls_strerror (val)); + return VLC_EGENERIC; + } - i_val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred ); - if( i_val != 0 ) + if (gnutls_SetPriority (obj, "protocols", + gnutls_protocol_set_priority, session, protos) + || gnutls_SetPriority (obj, "compression algorithms", + gnutls_compression_set_priority, session, comps) + || gnutls_SetPriority (obj, "MAC algorithms", + gnutls_mac_set_priority, session, macs) + || gnutls_SetPriority (obj, "ciphers", + gnutls_cipher_set_priority, session, ciphers) + || gnutls_SetPriority (obj, "key exchange algorithms", + gnutls_kx_set_priority, session, kx) + || gnutls_SetPriority (obj, "certificate types", + gnutls_certificate_type_set_priority, session, + cert_types)) + return VLC_EGENERIC; + + return VLC_SUCCESS; +} + + +static void +gnutls_ClientDelete( tls_session_t *p_session ) +{ + /* On the client-side, credentials are re-allocated per session */ + gnutls_certificate_credentials x509_cred = + ((tls_client_sys_t *)(p_session->p_sys))->x509_cred; + + gnutls_SessionClose( p_session ); + + /* credentials must be free'd *after* gnutls_deinit() */ + gnutls_certificate_free_credentials( x509_cred ); +} + + +static int +gnutls_Addx509File( vlc_object_t *p_this, + gnutls_certificate_credentials cred, + const char *psz_path, vlc_bool_t b_priv ); + +static int +gnutls_Addx509Directory( vlc_object_t *p_this, + gnutls_certificate_credentials cred, + const char *psz_dirname, + vlc_bool_t b_priv ) +{ + DIR* dir; + + if( *psz_dirname == '\0' ) + psz_dirname = "."; + + dir = utf8_opendir( psz_dirname ); + if( dir == NULL ) { - msg_Err( p_tls, "Cannot allocate X509 credentials : %s", - gnutls_strerror( i_val ) ); - free( p_sys ); - return NULL; + msg_Warn( p_this, "cannot open directory (%s): %s", psz_dirname, + strerror( errno ) ); + return VLC_EGENERIC; } +#ifdef S_ISLNK + else + { + struct stat st1, st2; + int fd = dirfd( dir ); + + /* + * Gets stats for the directory path, checks that it is not a + * symbolic link (to avoid possibly infinite recursion), and verifies + * that the inode is still the same, to avoid TOCTOU race condition. + */ + if( ( fd == -1) + || fstat( fd, &st1 ) || utf8_lstat( psz_dirname, &st2 ) + || S_ISLNK( st2.st_mode ) || ( st1.st_ino != st2.st_ino ) ) + { + closedir( dir ); + return VLC_EGENERIC; + } + } +#endif - if( psz_ca_path != NULL ) + for (;;) { - i_val = gnutls_certificate_set_x509_trust_file( p_sys->x509_cred, - psz_ca_path, - GNUTLS_X509_FMT_PEM ); - if( i_val != 0 ) + char *ent = utf8_readdir (dir); + if (ent == NULL) + break; + + if ((strcmp (ent, ".") == 0) || (strcmp (ent, "..") == 0)) + continue; + + char path[strlen (psz_dirname) + strlen (ent) + 2]; + sprintf (path, "%s"DIR_SEP"%s", psz_dirname, ent); + free (ent); + + gnutls_Addx509File( p_this, cred, path, b_priv ); + } + + closedir( dir ); + return VLC_SUCCESS; +} + + +static int +gnutls_Addx509File( vlc_object_t *p_this, + gnutls_certificate_credentials cred, + const char *psz_path, vlc_bool_t b_priv ) +{ + struct stat st; + + if( utf8_stat( psz_path, &st ) == 0 ) + { + if( S_ISREG( st.st_mode ) ) { - msg_Err( p_tls, "Cannot add trusted CA (%s) : %s", psz_ca_path, - gnutls_strerror( i_val ) ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - free( p_sys ); - return NULL; + char *psz_localname = ToLocale( psz_path ); + int i = b_priv + ? gnutls_certificate_set_x509_key_file( cred, + psz_localname, psz_localname, GNUTLS_X509_FMT_PEM ) + : gnutls_certificate_set_x509_trust_file( cred, + psz_localname, GNUTLS_X509_FMT_PEM ); + LocaleFree( psz_localname ); + + if( i < 0 ) + { + msg_Warn( p_this, "cannot add x509 credentials (%s): %s", + psz_path, gnutls_strerror( i ) ); + return VLC_EGENERIC; + } + else + { + msg_Dbg( p_this, "added x509 credentials (%s)", + psz_path ); + return VLC_SUCCESS; + } + } + else if( S_ISDIR( st.st_mode ) ) + { + msg_Dbg( p_this, + "looking recursively for x509 credentials in %s", + psz_path ); + return gnutls_Addx509Directory( p_this, cred, psz_path, b_priv); } } + else + msg_Warn( p_this, "cannot add x509 credentials (%s): %s", + psz_path, strerror( errno ) ); + return VLC_EGENERIC; +} - i_val = gnutls_init( &p_sys->session.session, GNUTLS_CLIENT ); - if( i_val != 0 ) + +/** + * Initializes a client-side TLS session. + */ +static tls_session_t * +gnutls_ClientCreate( tls_t *p_tls ) +{ + tls_session_t *p_session = NULL; + tls_client_sys_t *p_sys = NULL; + int i_val; + + p_sys = (tls_client_sys_t *)malloc( sizeof(struct tls_client_sys_t) ); + if( p_sys == NULL ) + return NULL; + + p_session = (struct tls_session_t *)vlc_object_create ( p_tls, sizeof(struct tls_session_t) ); + if( p_session == NULL ) { - msg_Err( p_tls, "Cannot initialize TLS session : %s", - gnutls_strerror( i_val ) ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); free( p_sys ); return NULL; } - i_val = gnutls_set_default_priority( p_sys->session.session ); - if( i_val < 0 ) + p_session->p_sys = p_sys; + p_session->sock.p_sys = p_session; + p_session->sock.pf_send = gnutls_Send; + p_session->sock.pf_recv = gnutls_Recv; + p_session->pf_handshake = gnutls_BeginHandshake; + p_session->pf_close = gnutls_ClientDelete; + + p_sys->session.b_handshaked = VLC_FALSE; + p_sys->session.psz_hostname = NULL; + + vlc_object_attach( p_session, p_tls ); + + const char *homedir = p_tls->p_libvlc->psz_homedir, + *datadir = config_GetDataDir (); + size_t l1 = strlen (homedir), l2 = strlen (datadir); + char path[((l1 > l2) ? l1 : l2) + sizeof ("/"CONFIG_DIR"/ssl/private")]; + // > sizeof ("/"CONFIG_DIR"/ssl/certs") + // > sizeof ("/ca-certificates.crt") + + i_val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred ); + if( i_val != 0 ) { - msg_Err( p_tls, "Cannot set ciphers priorities : %s", + msg_Err( p_tls, "cannot allocate X509 credentials: %s", gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session.session ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - free( p_sys ); - return NULL; + goto error; } - i_val = gnutls_certificate_type_set_priority( p_sys->session.session, - cert_type_priority ); - if( i_val < 0 ) + if (var_CreateGetBool (p_tls, "tls-check-cert")) { - msg_Err( p_tls, "Cannot set certificate type priorities : %s", + sprintf (path, "%s/"CONFIG_DIR"/ssl/certs", homedir); + gnutls_Addx509Directory ((vlc_object_t *)p_session, + p_sys->x509_cred, path, VLC_FALSE); + + sprintf (path, "%s/ca-certificates.crt", datadir); + gnutls_Addx509File ((vlc_object_t *)p_session, + p_sys->x509_cred, path, VLC_FALSE); + p_session->pf_handshake2 = gnutls_HandshakeAndValidate; + } + else + p_session->pf_handshake2 = gnutls_ContinueHandshake; + + sprintf (path, "%s/"CONFIG_DIR"/ssl/private", homedir); + gnutls_Addx509Directory ((vlc_object_t *)p_session, p_sys->x509_cred, + path, VLC_TRUE); + + i_val = gnutls_init( &p_sys->session.session, GNUTLS_CLIENT ); + if( i_val != 0 ) + { + msg_Err( p_tls, "cannot initialize TLS session: %s", gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session.session ); gnutls_certificate_free_credentials( p_sys->x509_cred ); - free( p_sys ); - return NULL; + goto error; } + if (gnutls_SessionPrioritize (VLC_OBJECT (p_session), + p_sys->session.session)) + goto s_error; + i_val = gnutls_credentials_set( p_sys->session.session, GNUTLS_CRD_CERTIFICATE, p_sys->x509_cred ); if( i_val < 0 ) { - msg_Err( p_tls, "Cannot set TLS session credentials : %s", + msg_Err( p_tls, "cannot set TLS session credentials: %s", gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session.session ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - free( p_sys ); - return NULL; + goto s_error; } - p_session = malloc( sizeof (struct tls_session_t) ); - if( p_session == NULL ) + return p_session; + +s_error: + gnutls_deinit( p_sys->session.session ); + gnutls_certificate_free_credentials( p_sys->x509_cred ); + +error: + vlc_object_detach( p_session ); + vlc_object_destroy( p_session ); + free( p_sys ); + + return NULL; +} + + +/** + * TLS session resumption callbacks (server-side) + */ +static int cb_store( void *p_server, gnutls_datum key, gnutls_datum data ) +{ + tls_server_sys_t *p_sys = ((tls_server_t *)p_server)->p_sys; + + if( ( p_sys->i_cache_size == 0 ) + || ( key.size > MAX_SESSION_ID ) + || ( data.size > MAX_SESSION_DATA ) ) + return -1; + + vlc_mutex_lock( &p_sys->cache_lock ); + + memcpy( p_sys->p_store->id, key.data, key.size); + memcpy( p_sys->p_store->data, data.data, data.size ); + p_sys->p_store->i_idlen = key.size; + p_sys->p_store->i_datalen = data.size; + + p_sys->p_store++; + if( ( p_sys->p_store - p_sys->p_cache ) == p_sys->i_cache_size ) + p_sys->p_store = p_sys->p_cache; + + vlc_mutex_unlock( &p_sys->cache_lock ); + + return 0; +} + + +static const gnutls_datum err_datum = { NULL, 0 }; + +static gnutls_datum cb_fetch( void *p_server, gnutls_datum key ) +{ + tls_server_sys_t *p_sys = ((tls_server_t *)p_server)->p_sys; + saved_session_t *p_session, *p_end; + + p_session = p_sys->p_cache; + p_end = p_session + p_sys->i_cache_size; + + vlc_mutex_lock( &p_sys->cache_lock ); + + while( p_session < p_end ) { - gnutls_deinit( p_sys->session.session ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - free( p_sys ); - return NULL; + if( ( p_session->i_idlen == key.size ) + && !memcmp( p_session->id, key.data, key.size ) ) + { + gnutls_datum data; + + data.size = p_session->i_datalen; + + data.data = gnutls_malloc( data.size ); + if( data.data == NULL ) + { + vlc_mutex_unlock( &p_sys->cache_lock ); + return err_datum; + } + + memcpy( data.data, p_session->data, data.size ); + vlc_mutex_unlock( &p_sys->cache_lock ); + return data; + } + p_session++; } - p_session->p_tls = p_tls; - p_session->p_server = NULL; - p_session->p_sys = p_sys; - p_session->sock.p_sys = p_session; - p_session->sock.pf_send = gnutls_Send; - p_session->sock.pf_recv = gnutls_Recv; - p_session->pf_handshake = gnutls_SessionHandshake; - p_session->pf_handshake2 = gnutls_SessionContinueHandshake; - p_session->pf_close = gnutls_SessionClose; + vlc_mutex_unlock( &p_sys->cache_lock ); - return p_session; + return err_datum; } -/***************************************************************************** - * tls_ServerSessionPrepare: - ***************************************************************************** - * Initializes server-side TLS session data. - *****************************************************************************/ +static int cb_delete( void *p_server, gnutls_datum key ) +{ + tls_server_sys_t *p_sys = ((tls_server_t *)p_server)->p_sys; + saved_session_t *p_session, *p_end; + + p_session = p_sys->p_cache; + p_end = p_session + p_sys->i_cache_size; + + vlc_mutex_lock( &p_sys->cache_lock ); + + while( p_session < p_end ) + { + if( ( p_session->i_idlen == key.size ) + && !memcmp( p_session->id, key.data, key.size ) ) + { + p_session->i_datalen = p_session->i_idlen = 0; + vlc_mutex_unlock( &p_sys->cache_lock ); + return 0; + } + p_session++; + } + + vlc_mutex_unlock( &p_sys->cache_lock ); + + return -1; +} + + +/** + * Initializes a server-side TLS session. + */ static tls_session_t * gnutls_ServerSessionPrepare( tls_server_t *p_server ) { tls_session_t *p_session; - tls_session_sys_t *p_sys; + tls_server_sys_t *p_server_sys; + gnutls_session session; int i_val; - vlc_value_t bits; - p_sys = (tls_session_sys_t *)malloc( sizeof(struct tls_session_sys_t) ); - if( p_sys == NULL ) + p_session = vlc_object_create( p_server, sizeof (struct tls_session_t) ); + if( p_session == NULL ) return NULL; - i_val = gnutls_init( &p_sys->session, GNUTLS_SERVER ); - if( i_val != 0 ) - { - msg_Err( p_server->p_tls, "Cannot initialize TLS session : %s", - gnutls_strerror( i_val ) ); - free( p_sys ); - return NULL; - } - - i_val = gnutls_set_default_priority( p_sys->session ); - if( i_val < 0 ) + p_session->p_sys = malloc( sizeof(struct tls_session_sys_t) ); + if( p_session->p_sys == NULL ) { - msg_Err( p_server->p_tls, "Cannot set ciphers priorities : %s", - gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session ); - free( p_sys ); + vlc_object_destroy( p_session ); return NULL; } - i_val = gnutls_credentials_set( p_sys->session, GNUTLS_CRD_CERTIFICATE, - ((tls_server_sys_t *)(p_server->p_sys)) - ->x509_cred ); - if( i_val < 0 ) + vlc_object_attach( p_session, p_server ); + + p_server_sys = (tls_server_sys_t *)p_server->p_sys; + p_session->sock.p_sys = p_session; + p_session->sock.pf_send = gnutls_Send; + p_session->sock.pf_recv = gnutls_Recv; + p_session->pf_handshake = gnutls_BeginHandshake; + p_session->pf_handshake2 = p_server_sys->pf_handshake2; + p_session->pf_close = gnutls_SessionClose; + + ((tls_session_sys_t *)p_session->p_sys)->b_handshaked = VLC_FALSE; + ((tls_session_sys_t *)p_session->p_sys)->psz_hostname = NULL; + + i_val = gnutls_init( &session, GNUTLS_SERVER ); + if( i_val != 0 ) { - msg_Err( p_server->p_tls, "Cannot set TLS session credentials : %s", + msg_Err( p_server, "cannot initialize TLS session: %s", gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session ); - free( p_sys ); - return NULL; + goto error; } - /* TODO: support for client authentication */ - /*gnutls_certificate_server_set_request( p_session->session, - GNUTLS_CERT_REQUEST ); */ + ((tls_session_sys_t *)p_session->p_sys)->session = session; - if( var_Get( p_server->p_tls, "dh-bits", &bits ) != VLC_SUCCESS ) + if (gnutls_SessionPrioritize (VLC_OBJECT (p_session), session)) { - var_Create( p_server->p_tls, "dh-bits", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_server->p_tls, "dh-bits", &bits ); + gnutls_deinit( session ); + goto error; } - gnutls_dh_set_prime_bits( p_sys->session, bits.i_int ); - - p_session = malloc( sizeof (struct tls_session_t) ); - if( p_session == NULL ) + i_val = gnutls_credentials_set( session, GNUTLS_CRD_CERTIFICATE, + p_server_sys->x509_cred ); + if( i_val < 0 ) { - gnutls_deinit( p_sys->session ); - free( p_sys ); - return NULL; + msg_Err( p_server, "cannot set TLS session credentials: %s", + gnutls_strerror( i_val ) ); + gnutls_deinit( session ); + goto error; } - p_session->p_tls = p_server->p_tls; - p_session->p_server = p_server; - p_session->p_sys = p_sys; - p_session->sock.p_sys = p_session; - p_session->sock.pf_send = gnutls_Send; - p_session->sock.pf_recv = gnutls_Recv; - p_session->pf_handshake = gnutls_SessionHandshake; - p_session->pf_handshake2 = gnutls_SessionContinueHandshake; - p_session->pf_close = gnutls_SessionClose; + if( p_session->pf_handshake2 == gnutls_HandshakeAndValidate ) + gnutls_certificate_server_set_request( session, GNUTLS_CERT_REQUIRE ); + + i_val = config_GetInt (p_server, "gnutls-dh-bits"); + gnutls_dh_set_prime_bits (session, i_val); + + /* Session resumption support */ + i_val = config_GetInt (p_server, "gnutls-cache-expiration"); + gnutls_db_set_cache_expiration (session, i_val); + gnutls_db_set_retrieve_function( session, cb_fetch ); + gnutls_db_set_remove_function( session, cb_delete ); + gnutls_db_set_store_function( session, cb_store ); + gnutls_db_set_ptr( session, p_server ); return p_session; + +error: + free( p_session->p_sys ); + vlc_object_detach( p_session ); + vlc_object_destroy( p_session ); + return NULL; } -/***************************************************************************** - * tls_ServerDelete: - ***************************************************************************** - * Releases data allocated with tls_ServerCreate. - *****************************************************************************/ +/** + * Releases data allocated with tls_ServerCreate(). + */ static void gnutls_ServerDelete( tls_server_t *p_server ) { - gnutls_certificate_free_credentials( - ((tls_server_sys_t *)(p_server->p_sys)) - ->x509_cred ); - free( p_server->p_sys ); - free( p_server ); + tls_server_sys_t *p_sys; + p_sys = (tls_server_sys_t *)p_server->p_sys; + + vlc_mutex_destroy( &p_sys->cache_lock ); + free( p_sys->p_cache ); + + vlc_object_detach( p_server ); + vlc_object_destroy( p_server ); + + /* all sessions depending on the server are now deinitialized */ + gnutls_certificate_free_credentials( p_sys->x509_cred ); + gnutls_dh_params_deinit( p_sys->dh_params ); + free( p_sys ); } -/***************************************************************************** - * tls_ServerAddCA: - ***************************************************************************** +/** * Adds one or more certificate authorities. - * TODO: we are not able to check the client credentials yet, so this function - * is pretty useless. - * Returns -1 on error, 0 on success. + * + * @param psz_ca_path (Unicode) path to an x509 certificates list. + * + * @return -1 on error, 0 on success. *****************************************************************************/ static int gnutls_ServerAddCA( tls_server_t *p_server, const char *psz_ca_path ) { + tls_server_sys_t *p_sys; + char *psz_local_path; int val; - val = gnutls_certificate_set_x509_trust_file( ((tls_server_sys_t *) - (p_server->p_sys)) - ->x509_cred, - psz_ca_path, + p_sys = (tls_server_sys_t *)(p_server->p_sys); + + psz_local_path = ToLocale( psz_ca_path ); + val = gnutls_certificate_set_x509_trust_file( p_sys->x509_cred, + psz_local_path, GNUTLS_X509_FMT_PEM ); + LocaleFree( psz_local_path ); if( val < 0 ) { - msg_Err( p_server->p_tls, "Cannot add trusted CA (%s) : %s", - psz_ca_path, gnutls_strerror( val ) ); - gnutls_ServerDelete( p_server ); + msg_Err( p_server, "cannot add trusted CA (%s): %s", psz_ca_path, + gnutls_strerror( val ) ); return VLC_EGENERIC; } - msg_Dbg( p_server->p_tls, " %d trusted CA added (%s)", val, - psz_ca_path ); + msg_Dbg( p_server, " %d trusted CA added (%s)", val, psz_ca_path ); + + /* enables peer's certificate verification */ + p_sys->pf_handshake2 = gnutls_HandshakeAndValidate; + return VLC_SUCCESS; } -/***************************************************************************** - * tls_ServerAddCRL: - ***************************************************************************** +/** * Adds a certificates revocation list to be sent to TLS clients. - * Returns -1 on error, 0 on success. - *****************************************************************************/ + * + * @param psz_crl_path (Unicode) path of the CRL file. + * + * @return -1 on error, 0 on success. + */ static int gnutls_ServerAddCRL( tls_server_t *p_server, const char *psz_crl_path ) { int val; + char *psz_local_path = ToLocale( psz_crl_path ); val = gnutls_certificate_set_x509_crl_file( ((tls_server_sys_t *) (p_server->p_sys))->x509_cred, - psz_crl_path, + psz_local_path, GNUTLS_X509_FMT_PEM ); + LocaleFree( psz_crl_path ); if( val < 0 ) { - msg_Err( p_server->p_tls, "Cannot add CRL (%s) : %s", - psz_crl_path, gnutls_strerror( val ) ); - gnutls_ServerDelete( p_server ); + msg_Err( p_server, "cannot add CRL (%s): %s", psz_crl_path, + gnutls_strerror( val ) ); return VLC_EGENERIC; } - msg_Dbg( p_server->p_tls, "%d CRL added (%s)", val, psz_crl_path ); + msg_Dbg( p_server, "%d CRL added (%s)", val, psz_crl_path ); return VLC_SUCCESS; } - -/***************************************************************************** - * tls_ServerCreate: - ***************************************************************************** + +/** * Allocates a whole server's TLS credentials. - * Returns NULL on error. - *****************************************************************************/ + * + * @return NULL on error. + */ static tls_server_t * -gnutls_ServerCreate( tls_t *p_this, const char *psz_cert_path, - const char *psz_key_path ) +gnutls_ServerCreate( tls_t *p_tls, const char *psz_cert_path, + const char *psz_key_path ) { tls_server_t *p_server; - tls_server_sys_t *p_server_sys; + tls_server_sys_t *p_sys; + char *psz_local_key, *psz_local_cert; int val; - msg_Dbg( p_this, "Creating TLS server" ); + msg_Dbg( p_tls, "creating TLS server" ); - p_server_sys = (tls_server_sys_t *)malloc( sizeof(struct tls_server_sys_t) ); - if( p_server_sys == NULL ) + p_sys = (tls_server_sys_t *)malloc( sizeof(struct tls_server_sys_t) ); + if( p_sys == NULL ) return NULL; + p_sys->i_cache_size = config_GetInt (p_tls, "gnutls-cache-size"); + p_sys->p_cache = (struct saved_session_t *)calloc( p_sys->i_cache_size, + sizeof( struct saved_session_t ) ); + if( p_sys->p_cache == NULL ) + { + free( p_sys ); + return NULL; + } + p_sys->p_store = p_sys->p_cache; + + p_server = vlc_object_create( p_tls, sizeof(struct tls_server_t) ); + if( p_server == NULL ) + { + free( p_sys->p_cache ); + free( p_sys ); + return NULL; + } + + vlc_object_attach( p_server, p_tls ); + + p_server->p_sys = p_sys; + p_server->pf_delete = gnutls_ServerDelete; + p_server->pf_add_CA = gnutls_ServerAddCA; + p_server->pf_add_CRL = gnutls_ServerAddCRL; + p_server->pf_session_prepare = gnutls_ServerSessionPrepare; + + /* No certificate validation by default */ + p_sys->pf_handshake2 = gnutls_ContinueHandshake; + + vlc_mutex_init( p_server, &p_sys->cache_lock ); + /* Sets server's credentials */ - val = gnutls_certificate_allocate_credentials( &p_server_sys->x509_cred ); + val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred ); if( val != 0 ) { - msg_Err( p_this, "Cannot allocate X509 credentials : %s", + msg_Err( p_server, "cannot allocate X509 credentials: %s", gnutls_strerror( val ) ); - free( p_server_sys ); - return NULL; + goto error; } - val = gnutls_certificate_set_x509_key_file( p_server_sys->x509_cred, - psz_cert_path, psz_key_path, + psz_local_cert = ToLocale( psz_cert_path ); + psz_local_key = ToLocale( psz_key_path ); + val = gnutls_certificate_set_x509_key_file( p_sys->x509_cred, + psz_local_cert, psz_local_key, GNUTLS_X509_FMT_PEM ); + LocaleFree( psz_cert_path ); + LocaleFree( psz_key_path ); if( val < 0 ) { - msg_Err( p_this, "Cannot set certificate chain or private key : %s", + msg_Err( p_server, "cannot set certificate chain or private key: %s", gnutls_strerror( val ) ); - gnutls_certificate_free_credentials( p_server_sys->x509_cred ); - free( p_server_sys ); - return NULL; + gnutls_certificate_free_credentials( p_sys->x509_cred ); + goto error; } - /* FIXME: regenerate these regularly */ - val = gnutls_dh_params_init( &p_server_sys->dh_params ); + /* FIXME: + * - regenerate these regularly + * - support other ciper suites + */ + val = gnutls_dh_params_init( &p_sys->dh_params ); if( val >= 0 ) { - vlc_value_t bits; - - if( var_Get( p_this, "dh-bits", &bits ) != VLC_SUCCESS ) - { - var_Create( p_this, "dh-bits", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_this, "dh-bits", &bits ); - } - - msg_Dbg( p_this, "Computing Diffie Hellman ciphers parameters" ); - val = gnutls_dh_params_generate2( p_server_sys->dh_params, - bits.i_int ); + msg_Dbg( p_server, "computing Diffie Hellman ciphers parameters" ); + val = gnutls_dh_params_generate2( p_sys->dh_params, + config_GetInt( p_tls, "gnutls-dh-bits" ) ); } if( val < 0 ) { - msg_Err( p_this, "Cannot initialize DH cipher suites : %s", + msg_Err( p_server, "cannot initialize DH cipher suites: %s", gnutls_strerror( val ) ); - gnutls_certificate_free_credentials( p_server_sys->x509_cred ); - free( p_server_sys ); - return NULL; + gnutls_certificate_free_credentials( p_sys->x509_cred ); + goto error; } - msg_Dbg( p_this, "Ciphers parameters computed" ); + msg_Dbg( p_server, "ciphers parameters computed" ); - gnutls_certificate_set_dh_params( p_server_sys->x509_cred, - p_server_sys->dh_params); - - p_server = (tls_server_t *)malloc( sizeof(struct tls_server_t) ); - if( p_server == NULL ) - { - free( p_server_sys ); - return NULL; - } - - p_server->p_tls = p_this; - p_server->p_sys = p_server_sys; - p_server->pf_delete = gnutls_ServerDelete; - p_server->pf_add_CA = gnutls_ServerAddCA; - p_server->pf_add_CRL = gnutls_ServerAddCRL; - p_server->pf_session_prepare = gnutls_ServerSessionPrepare; + gnutls_certificate_set_dh_params( p_sys->x509_cred, p_sys->dh_params); return p_server; + +error: + vlc_mutex_destroy( &p_sys->cache_lock ); + vlc_object_detach( p_server ); + vlc_object_destroy( p_server ); + free( p_sys ); + return NULL; } -/***************************************************************************** - * gcrypt thread option VLC implementation: - *****************************************************************************/ -vlc_object_t *__p_gcry_data; +#ifdef LIBVLC_USE_PTHREAD +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) +# define NEED_THREAD_CONTEXT 1 +static 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)); + 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); + 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) +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); + i_val = vlc_mutex_destroy( p_lock ); + free( p_lock ); return i_val; } -static int gcry_vlc_mutex_lock (void **p_sys) +static int gcry_vlc_mutex_lock( void **p_sys ) { - return vlc_mutex_lock ((vlc_mutex_t *)*p_sys); + return vlc_mutex_lock( (vlc_mutex_t *)*p_sys ); } -static int gcry_vlc_mutex_unlock (void **lock) +static int gcry_vlc_mutex_unlock( void **lock ) { - return vlc_mutex_unlock ((vlc_mutex_t *)*lock); + return vlc_mutex_unlock( (vlc_mutex_t *)*lock ); } static struct gcry_thread_cbs gcry_threads_vlc = @@ -609,50 +1207,51 @@ static struct gcry_thread_cbs gcry_threads_vlc = gcry_vlc_mutex_lock, gcry_vlc_mutex_unlock }; +#endif /***************************************************************************** * Module initialization *****************************************************************************/ +static unsigned refs = 0; + static int Open( vlc_object_t *p_this ) { tls_t *p_tls = (tls_t *)p_this; + vlc_mutex_t *lock; - vlc_value_t lock, count; - - var_Create( p_this->p_libvlc, "tls_mutex", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc, "tls_mutex", &lock ); - vlc_mutex_lock( lock.p_address ); + lock = var_GetGlobalMutex( "gnutls_mutex" ); + vlc_mutex_lock( lock ); /* Initialize GnuTLS only once */ - var_Create( p_this->p_libvlc, "gnutls_count", VLC_VAR_INTEGER ); - var_Get( p_this->p_libvlc, "gnutls_count", &count); - - if( count.i_int == 0) + if( refs == 0 ) { - __p_gcry_data = VLC_OBJECT( p_this->p_vlc ); +#ifdef NEED_THREAD_CONTEXT + __p_gcry_data = VLC_OBJECT( p_this->p_libvlc ); +#endif 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 ); + msg_Warn( p_this, "cannot initialize GnuTLS" ); + vlc_mutex_unlock( lock ); return VLC_EGENERIC; } - if( gnutls_check_version( "1.0.0" ) == NULL ) + + const char *psz_version = gnutls_check_version( "1.2.9" ); + if( psz_version == NULL ) { gnutls_global_deinit( ); - vlc_mutex_unlock( lock.p_address ); - msg_Err( p_this, "unsupported GNUTLS version" ); + vlc_mutex_unlock( lock ); + msg_Err( p_this, "unsupported GnuTLS version" ); return VLC_EGENERIC; } - msg_Dbg( p_this, "GNUTLS initialized" ); + msg_Dbg( p_this, "GnuTLS v%s initialized", psz_version ); } - count.i_int++; - var_Set( p_this->p_libvlc, "gnutls_count", count); - vlc_mutex_unlock( lock.p_address ); + refs++; + vlc_mutex_unlock( lock ); p_tls->pf_server_create = gnutls_ServerCreate; p_tls->pf_client_create = gnutls_ClientCreate; @@ -669,22 +1268,16 @@ Close( vlc_object_t *p_this ) /*tls_t *p_tls = (tls_t *)p_this; tls_sys_t *p_sys = (tls_sys_t *)(p_this->p_sys);*/ - vlc_value_t lock, count; - - var_Create( p_this->p_libvlc, "gnutls_mutex", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc, "gnutls_mutex", &lock ); - vlc_mutex_lock( lock.p_address ); + vlc_mutex_t *lock; - var_Create( p_this->p_libvlc, "gnutls_count", VLC_VAR_INTEGER ); - var_Get( p_this->p_libvlc, "gnutls_count", &count); - count.i_int--; - var_Set( p_this->p_libvlc, "gnutls_count", count); + lock = var_GetGlobalMutex( "gnutls_mutex" ); + vlc_mutex_lock( lock ); - if( count.i_int == 0 ) + if( --refs == 0 ) { gnutls_global_deinit( ); - msg_Dbg( p_this, "GNUTLS deinitialized" ); + msg_Dbg( p_this, "GnuTLS deinitialized" ); } - vlc_mutex_unlock( lock.p_address); + vlc_mutex_unlock( lock ); }