X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Fgnutls.c;h=c208b2cbf5e6f4ec418a9cf05272e14648cca92f;hb=e39842845193a0a263ae548fd8e10fce631d2f09;hp=b7ea68488b6840e5bad1075d6dbad1b609894677;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index b7ea68488b..c208b2cbf5 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -1,10 +1,10 @@ /***************************************************************************** - * tls.c + * gnutls.c ***************************************************************************** - * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors + * 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,21 +18,21 @@ * * 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 - */ - - /***************************************************************************** * Preamble *****************************************************************************/ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include -#include +#include #include #include @@ -41,153 +41,170 @@ #endif #ifdef HAVE_SYS_STAT_H # include -# ifdef HAVE_UNISTD_H -# include -# endif #endif +#ifdef WIN32 +# include +#else +# include +#endif +# include -#include "vlc_tls.h" +#include +#include +#include #include #include #include -#define DH_BITS 1024 -#define CACHE_EXPIRATION 3600 +#include + +#define CACHE_TIMEOUT 3600 #define CACHE_SIZE 64 +#include "dhparams.h" + +#include + /***************************************************************************** * Module descriptor *****************************************************************************/ -static int Open ( vlc_object_t * ); -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)." ) +static int OpenClient (vlc_object_t *); +static void CloseClient (vlc_object_t *); +static int OpenServer (vlc_object_t *); +static void CloseServer (vlc_object_t *); -#define CACHE_EXPIRATION_TEXT N_("Expiration time for resumed TLS sessions") -#define CACHE_EXPIRATION_LONGTEXT N_( \ - "Defines the delay before resumed TLS sessions will be expired " \ - "(in seconds)." ) +#define CACHE_TIMEOUT_TEXT N_("Expiration time for resumed TLS sessions") +#define CACHE_TIMEOUT_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_( \ - "Allows you to modify the maximum number of resumed TLS sessions that " \ + "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_( \ - "Ensures that server certificate is valid " \ - "(i.e. signed by an approved Certificate Authority)." ) - -#define CHECK_HOSTNAME_TEXT N_("Check TLS/SSL server hostname in certificate") -#define CHECK_HOSTNAME_LONGTEXT N_( \ - "Ensures that server hostname in certificate match requested host name." ) - vlc_module_begin(); set_shortname( "GnuTLS" ); - set_description( _("GnuTLS TLS encryption layer") ); - set_capability( "tls", 1 ); - set_callbacks( Open, Close ); + set_description( N_("GnuTLS transport layer security") ); + set_capability( "tls client", 1 ); + set_callbacks( OpenClient, CloseClient ); set_category( CAT_ADVANCED ); set_subcategory( SUBCAT_ADVANCED_MISC ); - add_bool( "tls-check-cert", VLC_FALSE, NULL, CHECK_CERT_TEXT, - CHECK_CERT_LONGTEXT, VLC_FALSE ); - add_bool( "tls-check-hostname", VLC_FALSE, NULL, CHECK_HOSTNAME_TEXT, - CHECK_HOSTNAME_LONGTEXT, VLC_FALSE ); - - add_integer( "dh-bits", DH_BITS, NULL, DH_BITS_TEXT, - DH_BITS_LONGTEXT, VLC_TRUE ); - add_integer( "tls-cache-expiration", CACHE_EXPIRATION, NULL, - CACHE_EXPIRATION_TEXT, CACHE_EXPIRATION_LONGTEXT, VLC_TRUE ); - add_integer( "tls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT, - CACHE_SIZE_LONGTEXT, VLC_TRUE ); + add_obsolete_bool( "tls-check-cert" ); + add_obsolete_bool( "tls-check-hostname" ); + + add_submodule(); + set_description( N_("GnuTLS server") ); + set_capability( "tls server", 1 ); + set_category( CAT_ADVANCED ); + set_subcategory( SUBCAT_ADVANCED_MISC ); + set_callbacks( OpenServer, CloseServer ); + + add_obsolete_integer( "gnutls-dh-bits" ); + add_integer( "gnutls-cache-timeout", CACHE_TIMEOUT, NULL, + CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, true ); + add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT, + CACHE_SIZE_LONGTEXT, true ); vlc_module_end(); +static vlc_mutex_t gnutls_mutex = VLC_STATIC_MUTEX; -#define MAX_SESSION_ID 32 -#define MAX_SESSION_DATA 1024 - -typedef struct saved_session_t +/** + * Initializes GnuTLS with proper locking. + * @return VLC_SUCCESS on success, a VLC error code otherwise. + */ +static int gnutls_Init (vlc_object_t *p_this) { - char id[MAX_SESSION_ID]; - char data[MAX_SESSION_DATA]; + int ret = VLC_EGENERIC; - unsigned i_idlen; - unsigned i_datalen; -} saved_session_t; + vlc_gcrypt_init (); /* GnuTLS depends on gcrypt */ + vlc_mutex_lock (&gnutls_mutex); + if (gnutls_global_init ()) + { + msg_Err (p_this, "cannot initialize GnuTLS"); + goto error; + } -typedef struct tls_server_sys_t -{ - gnutls_certificate_credentials x509_cred; - gnutls_dh_params dh_params; + const char *psz_version = gnutls_check_version ("1.3.3"); + if (psz_version == NULL) + { + msg_Err (p_this, "unsupported GnuTLS version"); + gnutls_global_deinit (); + goto error; + } - struct saved_session_t *p_cache; - struct saved_session_t *p_store; - int i_cache_size; - vlc_mutex_t cache_lock; + msg_Dbg (p_this, "GnuTLS v%s initialized", psz_version); + ret = VLC_SUCCESS; - int (*pf_handshake2)( tls_session_t * ); -} tls_server_sys_t; +error: + vlc_mutex_unlock (&gnutls_mutex); + return ret; +} -typedef struct tls_session_sys_t +/** + * Deinitializes GnuTLS. + */ +static void gnutls_Deinit (vlc_object_t *p_this) { - gnutls_session session; - char *psz_hostname; - vlc_bool_t b_handshaked; -} tls_session_sys_t; + vlc_mutex_lock (&gnutls_mutex); - -typedef struct tls_client_sys_t -{ - struct tls_session_sys_t session; - gnutls_certificate_credentials x509_cred; -} tls_client_sys_t; + gnutls_global_deinit (); + msg_Dbg (p_this, "GnuTLS deinitialized"); + vlc_mutex_unlock (&gnutls_mutex); +} -static int -_get_Int( vlc_object_t *p_this, const char *var ) +static int gnutls_Error (vlc_object_t *obj, int val) { - vlc_value_t value; - - if( var_Get( p_this, var, &value ) != VLC_SUCCESS ) + switch (val) { - var_Create( p_this, var, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_this, var, &value ); - } - - return value.i_int; -} + case GNUTLS_E_AGAIN: +#ifndef WIN32 + errno = EAGAIN; + break; +#endif + /* WinSock does not return EAGAIN, return EINTR instead */ -static int -_get_Bool( vlc_object_t *p_this, const char *var ) -{ - vlc_value_t value; + case GNUTLS_E_INTERRUPTED: +#ifdef WIN32 + WSASetLastError (WSAEINTR); +#else + errno = EINTR; +#endif + break; - if( var_Get( p_this, var, &value ) != VLC_SUCCESS ) - { - var_Create( p_this, var, VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Get( p_this, var, &value ); + default: + msg_Err (obj, "%s", gnutls_strerror (val)); +#ifndef NDEBUG + if (!gnutls_error_is_fatal (val)) + msg_Err (obj, "Error above should be handled"); +#endif +#ifdef WIN32 + WSASetLastError (WSAECONNRESET); +#else + errno = ECONNRESET; +#endif } - - return value.b_bool; + return -1; } -#define get_Int( a, b ) _get_Int( (vlc_object_t *)(a), (b) ) -#define get_Bool( a, b ) _get_Bool( (vlc_object_t *)(a), (b) ) +struct tls_session_sys_t +{ + gnutls_session_t session; + char *psz_hostname; + bool b_handshaked; +}; -/***************************************************************************** - * tls_Send: - ***************************************************************************** + +/** * Sends data through a TLS session. - *****************************************************************************/ + */ static int gnutls_Send( void *p_session, const void *buf, int i_length ) { @@ -197,16 +214,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 ) { @@ -216,423 +230,566 @@ 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; } -/***************************************************************************** - * tls_Session(Continue)?Handshake: - ***************************************************************************** - * Establishes TLS session with a peer through socket . - * Returns -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. - *****************************************************************************/ +/** + * Starts or continues the TLS handshake. + * + * @return -1 on fatal error, 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_ContinueHandshake( tls_session_t *p_session) +gnutls_ContinueHandshake (tls_session_t *p_session) { - tls_session_sys_t *p_sys; + tls_session_sys_t *p_sys = p_session->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 ) { - msg_Err( p_session, "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 ) ); - p_session->pf_close( p_session ); return -1; } - p_sys->b_handshaked = VLC_TRUE; + p_sys->b_handshaked = true; return 0; } -static int -gnutls_HandshakeAndValidate( tls_session_t *p_session ) + +typedef struct { - int val; + int flag; + const char *msg; +} error_msg_t; - val = gnutls_ContinueHandshake( p_session ); - if( val == 0 ) - { - int status; - gnutls_x509_crt cert; - const gnutls_datum *p_data; - tls_session_sys_t *p_sys; +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 } +}; - p_sys = (tls_session_sys_t *)(p_session->p_sys); - /* certificates chain verification */ - val = gnutls_certificate_verify_peers2( p_sys->session, &status ); - if( val ) - { - msg_Err( p_session, "TLS certificate verification failed : %s", - gnutls_strerror( val ) ); - p_session->pf_close( p_session ); - return -1; - } +static int +gnutls_HandshakeAndValidate( tls_session_t *session ) +{ + int val = gnutls_ContinueHandshake( session ); + if( val ) + return val; - if( status ) - { - msg_Warn( p_session, "TLS session : access denied" ); - if( status & GNUTLS_CERT_INVALID ) - msg_Dbg( p_session, "certificate could not be verified" ); - if( status & GNUTLS_CERT_REVOKED ) - msg_Dbg( p_session, "certificate was revoked" ); - if( status & GNUTLS_CERT_SIGNER_NOT_FOUND ) - msg_Dbg( p_session, "certificate's signer was not found" ); - if( status & GNUTLS_CERT_SIGNER_NOT_CA ) - msg_Dbg( p_session, "certificate's signer is not a CA" ); - p_session->pf_close( p_session ); - return -1; - } + tls_session_sys_t *p_sys = (tls_session_sys_t *)(session->p_sys); - msg_Dbg( p_session, "TLS certificate verified" ); - if( p_sys->psz_hostname == NULL ) - return 0; + /* certificates chain verification */ + unsigned status; + val = gnutls_certificate_verify_peers2( p_sys->session, &status ); - /* certificate (host)name verification */ - p_data = gnutls_certificate_get_peers( p_sys->session, &val ); - if( p_data == NULL ) - { - msg_Err( p_session, "TLS peer certificate not available" ); - p_session->pf_close( p_session ); - return -1; - } + if( val ) + { + msg_Err( session, "Certificate verification failed: %s", + gnutls_strerror( val ) ); + return -1; + } - val = gnutls_x509_crt_init( &cert ); - if( val ) + if( status ) + { + msg_Err( session, "TLS session: access denied" ); + for( const error_msg_t *e = cert_errors; e->flag; e++ ) { - msg_Err( p_session, "x509 fatal error : %s", - gnutls_strerror( val ) ); - p_session->pf_close( p_session ); - return -1; + if( status & e->flag ) + { + msg_Err( session, "%s", e->msg ); + status &= ~e->flag; + } } - val = gnutls_x509_crt_import( cert, p_data, GNUTLS_X509_FMT_DER ); - if( val ) - { - msg_Err( p_session, "x509 certificate import error : %s", - gnutls_strerror( val ) ); - gnutls_x509_crt_deinit( cert ); - p_session->pf_close( p_session ); - return -1; - } + if( status ) + msg_Err( session, + "unknown certificate error (you found a bug in VLC)" ); - if( gnutls_x509_crt_check_hostname( cert, p_sys->psz_hostname ) == 0 ) - { - msg_Err( p_session, "x509 certificate does not match \"%s\"", - p_sys->psz_hostname ); - gnutls_x509_crt_deinit( cert ); - p_session->pf_close( p_session ); - return -1; - } + return -1; + } - gnutls_x509_crt_deinit( cert ); - - msg_Dbg( p_session, "x509 hostname verified" ); - return 0; + /* certificate (host)name verification */ + const gnutls_datum_t *data; + data = gnutls_certificate_get_peers (p_sys->session, &(unsigned){0}); + if( data == NULL ) + { + msg_Err( session, "Peer certificate not available" ); + return -1; } - return val; -} + gnutls_x509_crt_t cert; + val = gnutls_x509_crt_init( &cert ); + if( val ) + { + msg_Err( session, "x509 fatal error: %s", gnutls_strerror( val ) ); + return -1; + } -static int -gnutls_BeginHandshake( tls_session_t *p_session, int fd, - const char *psz_hostname ) -{ - tls_session_sys_t *p_sys; + val = gnutls_x509_crt_import( cert, data, GNUTLS_X509_FMT_DER ); + if( val ) + { + msg_Err( session, "Certificate import error: %s", + gnutls_strerror( val ) ); + goto error; + } - p_sys = (tls_session_sys_t *)(p_session->p_sys); + assert( 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 error; + } - gnutls_transport_set_ptr (p_sys->session, (gnutls_transport_ptr)fd); + if( gnutls_x509_crt_get_expiration_time( cert ) < time( NULL ) ) + { + msg_Err( session, "Certificate expired" ); + goto error; + } - if( psz_hostname != NULL ) + if( gnutls_x509_crt_get_activation_time( cert ) > time ( NULL ) ) { - gnutls_server_name_set( p_sys->session, GNUTLS_NAME_DNS, psz_hostname, - strlen( psz_hostname ) ); - if( get_Bool( 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; - } - } + msg_Err( session, "Certificate not yet valid" ); + goto error; } - return p_session->pf_handshake2( p_session ); + gnutls_x509_crt_deinit( cert ); + msg_Dbg( session, "TLS/x509 certificate verified" ); + return 0; + +error: + gnutls_x509_crt_deinit( cert ); + return -1; } -/***************************************************************************** - * tls_SessionClose: - ***************************************************************************** - * Terminates TLS session and releases session data. - *****************************************************************************/ +/** + * Sets the operating system file descriptor backend for the TLS sesison. + * + * @param fd stream socket already connected with the peer. + */ static void -gnutls_SessionClose( tls_session_t *p_session ) +gnutls_SetFD (tls_session_t *p_session, int fd) { - tls_session_sys_t *p_sys; - - p_sys = (tls_session_sys_t *)(p_session->p_sys); - - 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 ); + gnutls_transport_set_ptr (p_session->p_sys->session, + (gnutls_transport_ptr_t)(intptr_t)fd); +} - vlc_object_detach( p_session ); - vlc_object_destroy( p_session ); +typedef int (*tls_prio_func) (gnutls_session_t, const int *); - free( p_sys ); +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) +{ + 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 void -gnutls_ClientDelete( tls_session_t *p_session ) + +static int +gnutls_SessionPrioritize (vlc_object_t *obj, gnutls_session_t 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; + /* 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 + }; - gnutls_SessionClose( p_session ); + 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; + } - /* credentials must be free'd *after* gnutls_deinit() */ - gnutls_certificate_free_credentials( x509_cred ); + 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; } -inline int -is_regular( const char *psz_filename ) -{ -#ifdef HAVE_SYS_STAT_H - struct stat st; - return ( stat( psz_filename, &st ) == 0 ) - && S_ISREG( st.st_mode ); -#else - return 1; -#endif -} +static int +gnutls_Addx509File( vlc_object_t *p_this, + gnutls_certificate_credentials_t cred, + const char *psz_path, bool b_priv ); static int gnutls_Addx509Directory( vlc_object_t *p_this, - gnutls_certificate_credentials cred, + gnutls_certificate_credentials_t cred, const char *psz_dirname, - vlc_bool_t private ) + bool b_priv ) { DIR* dir; - struct dirent *p_ent; - int i_len; if( *psz_dirname == '\0' ) psz_dirname = "."; - dir = opendir( psz_dirname ); + dir = utf8_opendir( psz_dirname ); if( dir == NULL ) { - msg_Warn( p_this, "Cannot open directory (%s) : %s", psz_dirname, - strerror( errno ) ); - return VLC_EGENERIC; - } - - i_len = strlen( psz_dirname ) + 2; + if (errno != ENOENT) + { + msg_Err (p_this, "cannot open directory (%s): %m", psz_dirname); + return VLC_EGENERIC; + } - while( ( p_ent = readdir( dir ) ) != NULL ) + msg_Dbg (p_this, "creating empty certificate directory: %s", + psz_dirname); + utf8_mkdir (psz_dirname, b_priv ? 0700 : 0755); + return VLC_SUCCESS; + } +#ifdef S_ISLNK + else { - char *psz_filename; + struct stat st1, st2; + int fd = dirfd( dir ); - psz_filename = (char *)malloc( i_len + strlen( p_ent->d_name ) ); - if( psz_filename == NULL ) + /* + * 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_ENOMEM; + return VLC_EGENERIC; } + } +#endif - sprintf( psz_filename, "%s/%s", psz_dirname, p_ent->d_name ); - /* we neglect the race condition here - not security sensitive */ - if( is_regular( psz_filename ) ) - { - int i; - - i = (private) - ? gnutls_certificate_set_x509_key_file( cred, psz_filename, - psz_filename, - GNUTLS_X509_FMT_PEM ) - : gnutls_certificate_set_x509_trust_file( cred, psz_filename, - GNUTLS_X509_FMT_PEM - ); - if( i < 0 ) - { - msg_Warn( p_this, "Cannot add x509 certificate (%s) : %s", - psz_filename, gnutls_strerror( i ) ); - } - } - free( psz_filename ); + for (;;) + { + 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; } -/***************************************************************************** - * tls_ClientCreate: - ***************************************************************************** - * Initializes client-side TLS session data. - *****************************************************************************/ -static tls_session_t * -gnutls_ClientCreate( tls_t *p_tls ) + +static int +gnutls_Addx509File( vlc_object_t *p_this, + gnutls_certificate_credentials cred, + const char *psz_path, bool b_priv ) { - tls_session_t *p_session = NULL; - tls_client_sys_t *p_sys = NULL; - int i_val; - const int cert_type_priority[3] = + struct stat st; + + int fd = utf8_open (psz_path, O_RDONLY, 0); + if (fd == -1) + goto error; + + block_t *block = block_File (fd); + if (block != NULL) { - GNUTLS_CRT_X509, - 0 - }; + close (fd); + + gnutls_datum data = { + .data = block->p_buffer, + .size = block->i_buffer, + }; + int res = b_priv + ? gnutls_certificate_set_x509_key_mem (cred, &data, &data, + GNUTLS_X509_FMT_PEM) + : gnutls_certificate_set_x509_trust_mem (cred, &data, + GNUTLS_X509_FMT_PEM); + block_Release (block); + + if (res < 0) + { + msg_Warn (p_this, "cannot add x509 credentials (%s): %s", + psz_path, gnutls_strerror (res)); + return VLC_EGENERIC; + } + msg_Dbg (p_this, "added x509 credentials (%s)", psz_path); + return VLC_SUCCESS; + } - 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 ) + if (!fstat (fd, &st) && S_ISDIR (st.st_mode)) { - free( p_sys ); - return NULL; + close (fd); + msg_Dbg (p_this, "looking recursively for x509 credentials in %s", + psz_path); + return gnutls_Addx509Directory (p_this, cred, psz_path, b_priv); } - 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; +error: + msg_Warn (p_this, "cannot add x509 credentials (%s): %m", psz_path); + if (fd != -1) + close (fd); + return VLC_EGENERIC; +} - p_sys->session.b_handshaked = VLC_FALSE; - p_sys->session.psz_hostname = NULL; - vlc_object_attach( p_session, p_tls ); +/** TLS client session data */ +typedef struct tls_client_sys_t +{ + struct tls_session_sys_t session; + gnutls_certificate_credentials_t x509_cred; +} tls_client_sys_t; - i_val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred ); - if( i_val != 0 ) - { - msg_Err( p_tls, "Cannot allocate X509 credentials : %s", - gnutls_strerror( i_val ) ); - goto error; - } - if( get_Bool( p_tls, "tls-check-cert" ) ) - { - /* FIXME: support for changing path/using multiple paths */ - char *psz_path; - const char *psz_homedir; - - psz_homedir = p_tls->p_vlc->psz_homedir; - psz_path = (char *)malloc( strlen( psz_homedir ) - + sizeof( CONFIG_DIR ) + 12 ); - if( psz_path == NULL ) - { - gnutls_certificate_free_credentials( p_sys->x509_cred ); - goto error; - } +/** + * Initializes a client-side TLS session. + */ +static int OpenClient (vlc_object_t *obj) +{ + tls_session_t *p_session = (tls_session_t *)obj; + int i_val; - sprintf( psz_path, "%s/"CONFIG_DIR"/ssl/certs", psz_homedir ); - gnutls_Addx509Directory( (vlc_object_t *)p_session, p_sys->x509_cred, - psz_path, VLC_FALSE ); + if (gnutls_Init (obj)) + return VLC_EGENERIC; - free( psz_path ); - p_session->pf_handshake2 = gnutls_HandshakeAndValidate; + tls_client_sys_t *p_sys = malloc (sizeof (*p_sys)); + if (p_sys == NULL) + { + gnutls_Deinit (obj); + return VLC_ENOMEM; } - else - p_session->pf_handshake2 = gnutls_ContinueHandshake; - { - /* FIXME: support for changing path/using multiple paths */ - char *psz_path; - const char *psz_homedir; - - psz_homedir = p_tls->p_vlc->psz_homedir; - psz_path = (char *)malloc( strlen( psz_homedir ) - + sizeof( CONFIG_DIR ) + 14 ); - if( psz_path == NULL ) - { - gnutls_certificate_free_credentials( p_sys->x509_cred ); - goto error; - } + p_session->p_sys = &p_sys->session; + p_session->sock.p_sys = p_session; + p_session->sock.pf_send = gnutls_Send; + p_session->sock.pf_recv = gnutls_Recv; + p_session->pf_set_fd = gnutls_SetFD; - sprintf( psz_path, "%s/"CONFIG_DIR"/ssl/private", psz_homedir ); - gnutls_Addx509Directory( (vlc_object_t *)p_session, p_sys->x509_cred, - psz_path, VLC_TRUE ); + p_sys->session.b_handshaked = false; - free( psz_path ); + i_val = gnutls_certificate_allocate_credentials (&p_sys->x509_cred); + if (i_val != 0) + { + msg_Err (obj, "cannot allocate X509 credentials: %s", + gnutls_strerror (i_val)); + goto error; } - i_val = gnutls_init( &p_sys->session.session, GNUTLS_CLIENT ); - if( i_val != 0 ) + char *userdir = config_GetUserDataDir (); + if (userdir != NULL) { - msg_Err( p_tls, "Cannot initialize TLS session : %s", - gnutls_strerror( i_val ) ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - goto error; + char path[strlen (userdir) + sizeof ("/ssl/private")]; + sprintf (path, "%s/ssl", userdir); + utf8_mkdir (path, 0755); + + sprintf (path, "%s/ssl/certs", userdir); + gnutls_Addx509Directory (VLC_OBJECT (p_session), + p_sys->x509_cred, path, false); + sprintf (path, "%s/ssl/private", userdir); + gnutls_Addx509Directory (VLC_OBJECT (p_session), p_sys->x509_cred, + path, true); + free (userdir); } - i_val = gnutls_set_default_priority( p_sys->session.session ); - if( i_val < 0 ) + const char *confdir = config_GetConfDir (); { - msg_Err( p_tls, "Cannot set ciphers priorities : %s", - gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session.session ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - goto error; + char path[strlen (confdir) + + sizeof ("/ssl/certs/ca-certificates.crt")]; + sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir); + gnutls_Addx509File (VLC_OBJECT (p_session), + p_sys->x509_cred, path, false); } + p_session->pf_handshake = gnutls_HandshakeAndValidate; + /*p_session->pf_handshake = gnutls_ContinueHandshake;*/ - i_val = gnutls_certificate_type_set_priority( p_sys->session.session, - cert_type_priority ); - if( i_val < 0 ) + i_val = gnutls_init (&p_sys->session.session, GNUTLS_CLIENT); + if (i_val != 0) { - msg_Err( p_tls, "Cannot set certificate type priorities : %s", - gnutls_strerror( i_val ) ); - gnutls_deinit( p_sys->session.session ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); + msg_Err (obj, "cannot initialize TLS session: %s", + gnutls_strerror (i_val)); + gnutls_certificate_free_credentials (p_sys->x509_cred); goto error; } - i_val = gnutls_credentials_set( p_sys->session.session, + if (gnutls_SessionPrioritize (VLC_OBJECT (p_session), + p_sys->session.session)) + goto s_error; + + /* minimum DH prime bits */ + gnutls_dh_set_prime_bits (p_sys->session.session, 1024); + + i_val = gnutls_credentials_set (p_sys->session.session, GNUTLS_CRD_CERTIFICATE, - p_sys->x509_cred ); - if( i_val < 0 ) + p_sys->x509_cred); + if (i_val < 0) { - 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 ); - goto error; + msg_Err (obj, "cannot set TLS session credentials: %s", + gnutls_strerror (i_val)); + goto s_error; } - return p_session; + char *servername = var_GetNonEmptyString (p_session, "tls-server-name"); + if (servername == NULL ) + msg_Err (p_session, "server name missing for TLS session"); + + p_sys->session.psz_hostname = servername; + gnutls_server_name_set (p_sys->session.session, GNUTLS_NAME_DNS, + servername, strlen (servername)); + return VLC_SUCCESS; + +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 ); + gnutls_Deinit (obj); + free (p_sys); + return VLC_EGENERIC; +} - return NULL; + +static void CloseClient (vlc_object_t *obj) +{ + tls_session_t *client = (tls_session_t *)obj; + tls_client_sys_t *p_sys = (tls_client_sys_t *)(client->p_sys); + + if (p_sys->session.b_handshaked == true) + gnutls_bye (p_sys->session.session, GNUTLS_SHUT_WR); + gnutls_deinit (p_sys->session.session); + /* credentials must be free'd *after* gnutls_deinit() */ + gnutls_certificate_free_credentials (p_sys->x509_cred); + + gnutls_Deinit (obj); + free (p_sys->session.psz_hostname); + free (p_sys); } -/***************************************************************************** - * TLS session resumption callbacks - *****************************************************************************/ +/** + * Server-side TLS + */ +struct tls_server_sys_t +{ + gnutls_certificate_credentials_t x509_cred; + gnutls_dh_params_t 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_handshake) (tls_session_t *); +}; + + +/** + * TLS session resumption callbacks (server-side) + */ +#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; + + 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; @@ -659,10 +816,9 @@ static int cb_store( void *p_server, gnutls_datum key, gnutls_datum data ) } -static const gnutls_datum err_datum = { NULL, 0 }; - static gnutls_datum cb_fetch( void *p_server, gnutls_datum key ) { + static const gnutls_datum_t err_datum = { NULL, 0 }; tls_server_sys_t *p_sys = ((tls_server_t *)p_server)->p_sys; saved_session_t *p_session, *p_end; @@ -676,7 +832,7 @@ static gnutls_datum cb_fetch( void *p_server, gnutls_datum key ) if( ( p_session->i_idlen == key.size ) && !memcmp( p_session->id, key.data, key.size ) ) { - gnutls_datum data; + gnutls_datum_t data; data.size = p_session->i_datalen; @@ -728,58 +884,71 @@ static int cb_delete( void *p_server, gnutls_datum key ) } -/***************************************************************************** - * tls_ServerSessionPrepare: - ***************************************************************************** - * Initializes server-side TLS session data. - *****************************************************************************/ +/** + * Terminates TLS session and releases session data. + * You still have to close the socket yourself. + */ +static void +gnutls_SessionClose (tls_server_t *p_server, tls_session_t *p_session) +{ + tls_session_sys_t *p_sys = p_session->p_sys; + (void)p_server; + + if( p_sys->b_handshaked == true ) + gnutls_bye( p_sys->session, GNUTLS_SHUT_WR ); + gnutls_deinit( p_sys->session ); + + vlc_object_detach( p_session ); + vlc_object_release( p_session ); + + free( p_sys ); +} + + +/** + * Initializes a server-side TLS session. + */ static tls_session_t * gnutls_ServerSessionPrepare( tls_server_t *p_server ) { tls_session_t *p_session; tls_server_sys_t *p_server_sys; - gnutls_session session; + gnutls_session_t session; int i_val; p_session = vlc_object_create( p_server, sizeof (struct tls_session_t) ); if( p_session == NULL ) return NULL; - + p_session->p_sys = malloc( sizeof(struct tls_session_sys_t) ); if( p_session->p_sys == NULL ) { - vlc_object_destroy( p_session ); + vlc_object_release( p_session ); return NULL; } - vlc_object_attach( p_session, p_server ); - - p_server_sys = (tls_server_sys_t *)p_server->p_sys; + p_server_sys = 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; + p_session->pf_set_fd = gnutls_SetFD; + p_session->pf_handshake = p_server_sys->pf_handshake; - ((tls_session_sys_t *)p_session->p_sys)->b_handshaked = VLC_FALSE; - ((tls_session_sys_t *)p_session->p_sys)->psz_hostname = NULL; + p_session->p_sys->b_handshaked = false; + p_session->p_sys->psz_hostname = NULL; i_val = gnutls_init( &session, GNUTLS_SERVER ); if( i_val != 0 ) { - msg_Err( p_server, "Cannot initialize TLS session : %s", + msg_Err( p_server, "cannot initialize TLS session: %s", gnutls_strerror( i_val ) ); goto error; } - ((tls_session_sys_t *)p_session->p_sys)->session = session; + p_session->p_sys->session = session; - i_val = gnutls_set_default_priority( session ); - if( i_val < 0 ) + if (gnutls_SessionPrioritize (VLC_OBJECT (p_session), session)) { - msg_Err( p_server, "Cannot set ciphers priorities : %s", - gnutls_strerror( i_val ) ); gnutls_deinit( session ); goto error; } @@ -788,20 +957,18 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server ) p_server_sys->x509_cred ); if( i_val < 0 ) { - msg_Err( p_server, "Cannot set TLS session credentials : %s", + msg_Err( p_server, "cannot set TLS session credentials: %s", gnutls_strerror( i_val ) ); gnutls_deinit( session ); goto error; } - if( p_session->pf_handshake2 == gnutls_HandshakeAndValidate ) - gnutls_certificate_server_set_request( session, GNUTLS_CERT_REQUIRE ); - - gnutls_dh_set_prime_bits( session, get_Int( p_server, "dh-bits" ) ); + if (p_session->pf_handshake == gnutls_HandshakeAndValidate) + gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUIRE); /* Session resumption support */ - gnutls_db_set_cache_expiration( session, get_Int( p_server, - "tls-cache-expiration" ) ); + i_val = config_GetInt (p_server, "gnutls-cache-timeout"); + 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 ); @@ -812,331 +979,190 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server ) error: free( p_session->p_sys ); vlc_object_detach( p_session ); - vlc_object_destroy( p_session ); + vlc_object_release( p_session ); return NULL; } -/***************************************************************************** - * tls_ServerDelete: - ***************************************************************************** - * Releases data allocated with tls_ServerCreate. - *****************************************************************************/ -static void -gnutls_ServerDelete( tls_server_t *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. - * 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 ) { - int val; tls_server_sys_t *p_sys; + char *psz_local_path; + int val; 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_ca_path, + psz_local_path, GNUTLS_X509_FMT_PEM ); + LocaleFree( psz_local_path ); if( val < 0 ) { - msg_Err( p_server, "Cannot add trusted CA (%s) : %s", psz_ca_path, + msg_Err( p_server, "cannot add trusted CA (%s): %s", psz_ca_path, gnutls_strerror( val ) ); return VLC_EGENERIC; } msg_Dbg( p_server, " %d trusted CA added (%s)", val, psz_ca_path ); /* enables peer's certificate verification */ - p_sys->pf_handshake2 = gnutls_HandshakeAndValidate; + p_sys->pf_handshake = 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, "Cannot add CRL (%s) : %s", psz_crl_path, + msg_Err( p_server, "cannot add CRL (%s): %s", psz_crl_path, gnutls_strerror( val ) ); return VLC_EGENERIC; } 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. - *****************************************************************************/ -static tls_server_t * -gnutls_ServerCreate( tls_t *p_tls, const char *psz_cert_path, - const char *psz_key_path ) + */ +static int OpenServer (vlc_object_t *obj) { - tls_server_t *p_server; + tls_server_t *p_server = (tls_server_t *)obj; tls_server_sys_t *p_sys; int val; - msg_Dbg( p_tls, "Creating TLS server" ); + if (gnutls_Init (obj)) + return VLC_EGENERIC; + + msg_Dbg (obj, "creating TLS server"); p_sys = (tls_server_sys_t *)malloc( sizeof(struct tls_server_sys_t) ); if( p_sys == NULL ) - return NULL; + return VLC_ENOMEM; - p_sys->i_cache_size = get_Int( p_tls, "tls-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 ) + p_sys->i_cache_size = config_GetInt (obj, "gnutls-cache-size"); + p_sys->p_cache = calloc (p_sys->i_cache_size, + sizeof (struct saved_session_t)); + if (p_sys->p_cache == NULL) { - free( p_sys ); - return NULL; + free (p_sys); + return VLC_ENOMEM; } - 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_sys->p_store = p_sys->p_cache; p_server->p_sys = p_sys; - p_server->pf_delete = gnutls_ServerDelete; - p_server->pf_add_CA = gnutls_ServerAddCA; + p_server->pf_add_CA = gnutls_ServerAddCA; p_server->pf_add_CRL = gnutls_ServerAddCRL; - p_server->pf_session_prepare = gnutls_ServerSessionPrepare; + p_server->pf_open = gnutls_ServerSessionPrepare; + p_server->pf_close = gnutls_SessionClose; /* No certificate validation by default */ - p_sys->pf_handshake2 = gnutls_ContinueHandshake; + p_sys->pf_handshake = gnutls_ContinueHandshake; - /* FIXME: check for errors */ - vlc_mutex_init( p_server, &p_sys->cache_lock ); + vlc_mutex_init( &p_sys->cache_lock ); /* Sets server's credentials */ val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred ); if( val != 0 ) { - msg_Err( p_server, "Cannot allocate X509 credentials : %s", + msg_Err( p_server, "cannot allocate X509 credentials: %s", gnutls_strerror( val ) ); goto error; } - val = gnutls_certificate_set_x509_key_file( p_sys->x509_cred, - psz_cert_path, psz_key_path, + char *psz_cert_path = var_GetNonEmptyString (obj, "tls-x509-cert"); + char *psz_key_path = var_GetNonEmptyString (obj, "tls-x509-key"); + const char *psz_local_cert = ToLocale (psz_cert_path); + const char *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_local_key); + free (psz_key_path); + LocaleFree (psz_local_cert); + free (psz_cert_path); + if( val < 0 ) { - msg_Err( p_server, "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_sys->x509_cred ); goto error; } /* FIXME: - * - regenerate these regularly * - support other ciper suites */ - val = gnutls_dh_params_init( &p_sys->dh_params ); - if( val >= 0 ) + val = gnutls_dh_params_init (&p_sys->dh_params); + if (val >= 0) { - msg_Dbg( p_server, "Computing Diffie Hellman ciphers parameters" ); - val = gnutls_dh_params_generate2( p_sys->dh_params, - get_Int( p_tls, "dh-bits" ) ); + const gnutls_datum_t data = { + .data = (unsigned char *)dh_params, + .size = sizeof (dh_params) - 1, + }; + + val = gnutls_dh_params_import_pkcs3 (p_sys->dh_params, &data, + GNUTLS_X509_FMT_PEM); + if (val == 0) + gnutls_certificate_set_dh_params (p_sys->x509_cred, + p_sys->dh_params); } - if( val < 0 ) + if (val < 0) { - msg_Err( p_server, "Cannot initialize DH cipher suites : %s", - gnutls_strerror( val ) ); - gnutls_certificate_free_credentials( p_sys->x509_cred ); - goto error; + msg_Err (p_server, "cannot initialize DHE cipher suites: %s", + gnutls_strerror (val)); } - msg_Dbg( p_server, "Ciphers parameters computed" ); - - gnutls_certificate_set_dh_params( p_sys->x509_cred, p_sys->dh_params); - return p_server; + return VLC_SUCCESS; error: - vlc_mutex_destroy( &p_sys->cache_lock ); - vlc_object_detach( p_server ); - vlc_object_destroy( p_server ); - free( p_sys ); - return NULL; + vlc_mutex_destroy (&p_sys->cache_lock); + free (p_sys->p_cache); + free (p_sys); + return VLC_EGENERIC; } - -/***************************************************************************** - * 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 -}; - - -/***************************************************************************** - * Module initialization - *****************************************************************************/ -static int -Open( vlc_object_t *p_this ) -{ - tls_t *p_tls = (tls_t *)p_this; - - 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 ); - - /* 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) - { - const char *psz_version; - - __p_gcry_data = VLC_OBJECT( p_this->p_vlc ); - - 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; - } - /* - * FIXME: in fact, we currently depends on 1.0.17, but it breaks on - * Debian which as a patched 1.0.16 (which we can use). - */ - psz_version = gnutls_check_version( "1.0.16" ); - if( psz_version == 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 v%s initialized", psz_version ); - } - - count.i_int++; - var_Set( p_this->p_libvlc, "gnutls_count", count); - vlc_mutex_unlock( lock.p_address ); - - p_tls->pf_server_create = gnutls_ServerCreate; - p_tls->pf_client_create = gnutls_ClientCreate; - return VLC_SUCCESS; -} - - -/***************************************************************************** - * Module deinitialization - *****************************************************************************/ -static void -Close( vlc_object_t *p_this ) +/** + * Destroys a TLS server object. + */ +static void CloseServer (vlc_object_t *p_server) { - /*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 ); + tls_server_sys_t *p_sys = ((tls_server_t *)p_server)->p_sys; - 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); + vlc_mutex_destroy (&p_sys->cache_lock); + free (p_sys->p_cache); - if( count.i_int == 0 ) - { - gnutls_global_deinit( ); - msg_Dbg( p_this, "GnuTLS deinitialized" ); - } + /* 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); - vlc_mutex_unlock( lock.p_address ); + gnutls_Deinit (p_server); }