X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Fgnutls.c;h=5c527d2b1213045745417c5f204533ba898f747e;hb=c3d7a3757351b49909fe328e104e08fa596dd511;hp=1f6be91df328f4afd719ab3ba5c95c08cfdfa04f;hpb=9b6ca602809f373e1770e32720f7961c3a0febed;p=vlc diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 1f6be91df3..5c527d2b12 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -29,25 +29,28 @@ # include "config.h" #endif -#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 +#ifdef WIN32 +# include +#else +# include +#endif +# include #include #include +#include +#include #include #include @@ -60,6 +63,8 @@ #include "dhparams.h" +#include + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -78,30 +83,32 @@ static void CloseServer (vlc_object_t *); "This is the maximum number of resumed TLS sessions that " \ "the cache will hold." ) -vlc_module_begin(); - set_shortname( "GnuTLS" ); - set_description( _("GnuTLS transport layer security") ); - set_capability( "tls client", 1 ); - set_callbacks( OpenClient, CloseClient ); - set_category( CAT_ADVANCED ); - set_subcategory( SUBCAT_ADVANCED_MISC ); - - add_obsolete_bool( "tls-check-cert" ); - add_obsolete_bool( "tls-check-hostname" ); - - add_submodule(); - set_description( _("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" ); +vlc_module_begin () + set_shortname( "GnuTLS" ) + 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_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 ); + 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(); + CACHE_SIZE_LONGTEXT, true ) +vlc_module_end () + +static vlc_mutex_t gnutls_mutex = VLC_STATIC_MUTEX; /** * Initializes GnuTLS with proper locking. @@ -113,7 +120,7 @@ static int gnutls_Init (vlc_object_t *p_this) vlc_gcrypt_init (); /* GnuTLS depends on gcrypt */ - vlc_mutex_t *lock = var_AcquireMutex ("gnutls_mutex"); + vlc_mutex_lock (&gnutls_mutex); if (gnutls_global_init ()) { msg_Err (p_this, "cannot initialize GnuTLS"); @@ -132,7 +139,7 @@ static int gnutls_Init (vlc_object_t *p_this) ret = VLC_SUCCESS; error: - vlc_mutex_unlock (lock); + vlc_mutex_unlock (&gnutls_mutex); return ret; } @@ -142,11 +149,11 @@ error: */ static void gnutls_Deinit (vlc_object_t *p_this) { - vlc_mutex_t *lock = var_AcquireMutex( "gnutls_mutex" ); + vlc_mutex_lock (&gnutls_mutex); gnutls_global_deinit (); msg_Dbg (p_this, "GnuTLS deinitialized"); - vlc_mutex_unlock (lock); + vlc_mutex_unlock (&gnutls_mutex); } @@ -155,11 +162,12 @@ static int gnutls_Error (vlc_object_t *obj, int val) switch (val) { case GNUTLS_E_AGAIN: -#ifndef WIN32 +#ifdef WIN32 + WSASetLastError (WSAEWOULDBLOCK); +#else errno = EAGAIN; - break; #endif - /* WinSock does not return EAGAIN, return EINTR instead */ + break; case GNUTLS_E_INTERRUPTED: #ifdef WIN32 @@ -228,7 +236,7 @@ gnutls_Recv( void *p_session, void *buf, int i_length ) /** * Starts or continues the TLS handshake. * - * @return -1 on fatal error, 0 on succesful handshake completion, + * @return -1 on fatal error, 0 on successful handshake completion, * 1 if more would-be blocking recv is needed, * 2 if more would-be blocking send is required. */ @@ -411,6 +419,7 @@ gnutls_SessionPrioritize (vlc_object_t *obj, gnutls_session_t session) /* Note that ordering matters (on the client side) */ static const int protos[] = { + /*GNUTLS_TLS1_2, as of GnuTLS 2.6.5, still not ratified */ GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, @@ -424,6 +433,9 @@ gnutls_SessionPrioritize (vlc_object_t *obj, gnutls_session_t session) }; static const int macs[] = { + GNUTLS_MAC_SHA512, + GNUTLS_MAC_SHA384, + GNUTLS_MAC_SHA256, GNUTLS_MAC_SHA1, GNUTLS_MAC_RMD160, // RIPEMD GNUTLS_MAC_MD5, @@ -437,6 +449,7 @@ gnutls_SessionPrioritize (vlc_object_t *obj, gnutls_session_t session) GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, + // TODO? Camellia ciphers? //GNUTLS_CIPHER_DES_CBC, //GNUTLS_CIPHER_ARCFOUR_40, //GNUTLS_CIPHER_RC2_40_CBC, @@ -507,7 +520,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, if( *psz_dirname == '\0' ) psz_dirname = "."; - dir = utf8_opendir( psz_dirname ); + dir = vlc_opendir( psz_dirname ); if( dir == NULL ) { if (errno != ENOENT) @@ -518,7 +531,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, msg_Dbg (p_this, "creating empty certificate directory: %s", psz_dirname); - utf8_mkdir (psz_dirname, b_priv ? 0700 : 0755); + vlc_mkdir (psz_dirname, b_priv ? 0700 : 0755); return VLC_SUCCESS; } #ifdef S_ISLNK @@ -533,7 +546,7 @@ gnutls_Addx509Directory( vlc_object_t *p_this, * that the inode is still the same, to avoid TOCTOU race condition. */ if( ( fd == -1) - || fstat( fd, &st1 ) || utf8_lstat( psz_dirname, &st2 ) + || fstat( fd, &st1 ) || vlc_lstat( psz_dirname, &st2 ) || S_ISLNK( st2.st_mode ) || ( st1.st_ino != st2.st_ino ) ) { closedir( dir ); @@ -544,12 +557,15 @@ gnutls_Addx509Directory( vlc_object_t *p_this, for (;;) { - char *ent = utf8_readdir (dir); + char *ent = vlc_readdir (dir); if (ent == NULL) break; if ((strcmp (ent, ".") == 0) || (strcmp (ent, "..") == 0)) + { + free( ent ); continue; + } char path[strlen (psz_dirname) + strlen (ent) + 2]; sprintf (path, "%s"DIR_SEP"%s", psz_dirname, ent); @@ -570,41 +586,48 @@ gnutls_Addx509File( vlc_object_t *p_this, { struct stat st; - if( utf8_stat( psz_path, &st ) == 0 ) + int fd = vlc_open (psz_path, O_RDONLY); + 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; } @@ -651,12 +674,12 @@ static int OpenClient (vlc_object_t *obj) goto error; } - char *userdir = config_GetUserDataDir (); + char *userdir = config_GetUserDir ( VLC_DATA_DIR ); if (userdir != NULL) { char path[strlen (userdir) + sizeof ("/ssl/private")]; sprintf (path, "%s/ssl", userdir); - utf8_mkdir (path, 0755); + vlc_mkdir (path, 0755); sprintf (path, "%s/ssl/certs", userdir); gnutls_Addx509Directory (VLC_OBJECT (p_session), @@ -667,10 +690,11 @@ static int OpenClient (vlc_object_t *obj) free (userdir); } - const char *datadir = config_GetDataDir (); + const char *confdir = config_GetConfDir (); { - char path[strlen (datadir) + sizeof ("/ca-certificates.crt")]; - sprintf (path, "%s/ca-certificates.crt", datadir); + 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); } @@ -706,10 +730,11 @@ static int OpenClient (vlc_object_t *obj) char *servername = var_GetNonEmptyString (p_session, "tls-server-name"); if (servername == NULL ) msg_Err (p_session, "server name missing for TLS session"); + else + gnutls_server_name_set (p_sys->session.session, GNUTLS_NAME_DNS, + servername, strlen (servername)); p_sys->session.psz_hostname = servername; - gnutls_server_name_set (p_sys->session.session, GNUTLS_NAME_DNS, - servername, strlen (servername)); return VLC_SUCCESS; @@ -881,7 +906,6 @@ gnutls_SessionClose (tls_server_t *p_server, tls_session_t *p_session) 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 ); @@ -950,8 +974,9 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server ) gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUIRE); /* Session resumption support */ - i_val = config_GetInt (p_server, "gnutls-cache-timeout"); - gnutls_db_set_cache_expiration (session, i_val); + i_val = var_InheritInteger (p_server, "gnutls-cache-timeout"); + if (i_val >= 0) + 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 ); @@ -961,7 +986,6 @@ gnutls_ServerSessionPrepare( tls_server_t *p_server ) error: free( p_session->p_sys ); - vlc_object_detach( p_session ); vlc_object_release( p_session ); return NULL; } @@ -1050,7 +1074,9 @@ static int OpenServer (vlc_object_t *obj) if( p_sys == NULL ) return VLC_ENOMEM; - p_sys->i_cache_size = config_GetInt (obj, "gnutls-cache-size"); + p_sys->i_cache_size = var_InheritInteger (obj, "gnutls-cache-size"); + if (p_sys->i_cache_size == -1) /* Duh, config subsystem exploded?! */ + p_sys->i_cache_size = 0; p_sys->p_cache = calloc (p_sys->i_cache_size, sizeof (struct saved_session_t)); if (p_sys->p_cache == NULL)