X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Fgnutls.c;h=622807bdfd7e7d640359497dff78b67a7a9a7ff6;hb=588723d7c65ccdb0fa5cc39b3cae132176637300;hp=d5677b268dd33fdf6d8eaac2cd3e128fce3dc3db;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index d5677b268d..622807bdfd 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -25,7 +25,12 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -36,24 +41,32 @@ #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 +#include + #define CACHE_TIMEOUT 3600 #define CACHE_SIZE 64 #include "dhparams.h" +#include + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -74,7 +87,7 @@ static void CloseServer (vlc_object_t *); vlc_module_begin(); set_shortname( "GnuTLS" ); - set_description( _("GnuTLS transport layer security") ); + set_description( N_("GnuTLS transport layer security") ); set_capability( "tls client", 1 ); set_callbacks( OpenClient, CloseClient ); set_category( CAT_ADVANCED ); @@ -84,7 +97,7 @@ vlc_module_begin(); add_obsolete_bool( "tls-check-hostname" ); add_submodule(); - set_description( _("GnuTLS server") ); + set_description( N_("GnuTLS server") ); set_capability( "tls server", 1 ); set_category( CAT_ADVANCED ); set_subcategory( SUBCAT_ADVANCED_MISC ); @@ -92,72 +105,11 @@ vlc_module_begin(); add_obsolete_integer( "gnutls-dh-bits" ); add_integer( "gnutls-cache-timeout", CACHE_TIMEOUT, NULL, - CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, VLC_TRUE ); + CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, true ); add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT, - CACHE_SIZE_LONGTEXT, VLC_TRUE ); + CACHE_SIZE_LONGTEXT, true ); vlc_module_end(); - - -#ifdef LIBVLC_USE_PTHREAD -GCRY_THREAD_OPTION_PTHREAD_IMPL; -# define gcry_threads_vlc gcry_threads_pthread -#else -/** - * gcrypt thread option VLC implementation - */ - -# define NEED_THREAD_CONTEXT 1 -static vlc_object_t *__p_gcry_data = NULL; - -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 -}; -#endif - - /** * Initializes GnuTLS with proper locking. * @return VLC_SUCCESS on success, a VLC error code otherwise. @@ -166,15 +118,9 @@ static int gnutls_Init (vlc_object_t *p_this) { int ret = VLC_EGENERIC; - vlc_mutex_t *lock = var_AcquireMutex ("gnutls_mutex"); + vlc_gcrypt_init (); /* GnuTLS depends on gcrypt */ - /* This should probably be removed/fixed. It will screw up with multiple - * LibVLC instances. */ -#ifdef NEED_THREAD_CONTEXT - __p_gcry_data = VLC_OBJECT (p_this->p_libvlc); -#endif - - gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc); + vlc_mutex_t *lock = var_AcquireMutex ("gnutls_mutex"); if (gnutls_global_init ()) { msg_Err (p_this, "cannot initialize GnuTLS"); @@ -250,7 +196,7 @@ struct tls_session_sys_t { gnutls_session_t session; char *psz_hostname; - vlc_bool_t b_handshaked; + bool b_handshaked; }; @@ -316,7 +262,7 @@ gnutls_ContinueHandshake (tls_session_t *p_session) return -1; } - p_sys->b_handshaked = VLC_TRUE; + p_sys->b_handshaked = true; return 0; } @@ -555,13 +501,13 @@ gnutls_SessionPrioritize (vlc_object_t *obj, gnutls_session_t session) static int gnutls_Addx509File( vlc_object_t *p_this, gnutls_certificate_credentials_t cred, - const char *psz_path, vlc_bool_t b_priv ); + const char *psz_path, bool b_priv ); static int gnutls_Addx509Directory( vlc_object_t *p_this, gnutls_certificate_credentials_t cred, const char *psz_dirname, - vlc_bool_t b_priv ) + bool b_priv ) { DIR* dir; @@ -627,45 +573,52 @@ gnutls_Addx509Directory( vlc_object_t *p_this, static int gnutls_Addx509File( vlc_object_t *p_this, gnutls_certificate_credentials cred, - const char *psz_path, vlc_bool_t b_priv ) + const char *psz_path, bool b_priv ) { struct stat st; - if( utf8_stat( psz_path, &st ) == 0 ) + int fd = utf8_open (psz_path, O_RDONLY, 0); + if (fd == -1) + goto error; + + block_t *block = block_File (fd); + if (block != NULL) { - if( S_ISREG( st.st_mode ) ) - { - 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 ) ) + 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_Dbg( p_this, - "looking recursively for x509 credentials in %s", - psz_path ); - return gnutls_Addx509Directory( p_this, cred, psz_path, b_priv); + 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; } - else - msg_Warn( p_this, "cannot add x509 credentials (%s): %m", psz_path ); + + if (!fstat (fd, &st) && S_ISDIR (st.st_mode)) + { + 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); + } + +error: + msg_Warn (p_this, "cannot add x509 credentials (%s): %m", psz_path); + if (fd != -1) + close (fd); return VLC_EGENERIC; } @@ -702,14 +655,7 @@ static int OpenClient (vlc_object_t *obj) p_session->sock.pf_recv = gnutls_Recv; p_session->pf_set_fd = gnutls_SetFD; - p_sys->session.b_handshaked = VLC_FALSE; - - const char *homedir = obj->p_libvlc->psz_datadir, - *datadir = config_GetDataDir (); - size_t l1 = strlen (homedir), l2 = strlen (datadir); - char path[((l1 > l2) ? l1 : l2) + sizeof ("/ca-certificates.crt")]; - // > sizeof ("/ssl/private") - // > sizeof ("/ssl/certs") + p_sys->session.b_handshaked = false; i_val = gnutls_certificate_allocate_credentials (&p_sys->x509_cred); if (i_val != 0) @@ -719,23 +665,33 @@ static int OpenClient (vlc_object_t *obj) goto error; } - sprintf (path, "%s/ssl", homedir); - utf8_mkdir (path, 0755); - - sprintf (path, "%s/ssl/certs", homedir); - gnutls_Addx509Directory (VLC_OBJECT (p_session), - p_sys->x509_cred, path, VLC_FALSE); + char *userdir = config_GetUserDataDir (); + if (userdir != NULL) + { + 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); + } - sprintf (path, "%s/ca-certificates.crt", datadir); - gnutls_Addx509File (VLC_OBJECT (p_session), - p_sys->x509_cred, path, VLC_FALSE); + const char *confdir = config_GetConfDir (); + { + 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;*/ - sprintf (path, "%s/ssl/private", homedir); - gnutls_Addx509Directory (VLC_OBJECT (p_session), p_sys->x509_cred, - path, VLC_TRUE); - i_val = gnutls_init (&p_sys->session.session, GNUTLS_CLIENT); if (i_val != 0) { @@ -787,7 +743,7 @@ 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 == VLC_TRUE) + 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() */ @@ -936,12 +892,12 @@ 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 == VLC_TRUE ) + 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_destroy( p_session ); + vlc_object_release( p_session ); free( p_sys ); } @@ -965,7 +921,7 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server ) 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; } @@ -976,7 +932,7 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server ) p_session->pf_set_fd = gnutls_SetFD; p_session->pf_handshake = p_server_sys->pf_handshake; - p_session->p_sys->b_handshaked = VLC_FALSE; + p_session->p_sys->b_handshaked = false; p_session->p_sys->psz_hostname = NULL; i_val = gnutls_init( &session, GNUTLS_SERVER ); @@ -1021,7 +977,7 @@ 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; } @@ -1128,7 +1084,7 @@ static int OpenServer (vlc_object_t *obj) /* No certificate validation by default */ p_sys->pf_handshake = gnutls_ContinueHandshake; - 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 );