/*****************************************************************************
- * tls.c
+ * gnutls.c
*****************************************************************************
* Copyright (C) 2004-2006 Rémi Denis-Courmont
* $Id$
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/*
- * TODO:
- * - fix FIXMEs
- */
-
-
/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#include <vlc/vlc.h>
#include <stdlib.h>
#include <errno.h>
-#include <vlc/vlc.h>
+#include <time.h>
#include <sys/types.h>
#include <errno.h>
#include "vlc_tls.h"
-#include "charset.h"
+#include <vlc_charset.h>
#include <gcrypt.h>
#include <gnutls/gnutls.h>
#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_( \
- "Defines the delay before resumed TLS sessions will be expired " \
- "(in seconds)." )
+ "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)." )
+ "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_( \
- "Ensures that server hostname in certificate match requested host name." )
+ "This ensures that the server hostname in certificate matches the " \
+ "requested host name." )
vlc_module_begin();
set_shortname( "GnuTLS" );
set_category( CAT_ADVANCED );
set_subcategory( SUBCAT_ADVANCED_MISC );
- add_bool( "tls-check-cert", VLC_FALSE, NULL, CHECK_CERT_TEXT,
+ add_bool( "tls-check-cert", VLC_TRUE, NULL, CHECK_CERT_TEXT,
CHECK_CERT_LONGTEXT, VLC_FALSE );
- add_bool( "tls-check-hostname", VLC_FALSE, NULL, CHECK_HOSTNAME_TEXT,
+ add_bool( "tls-check-hostname", VLC_TRUE, NULL, CHECK_HOSTNAME_TEXT,
CHECK_HOSTNAME_LONGTEXT, VLC_FALSE );
- add_integer( "dh-bits", DH_BITS, NULL, DH_BITS_TEXT,
+ add_integer( "gnutls-dh-bits", DH_BITS, NULL, DH_BITS_TEXT,
DH_BITS_LONGTEXT, VLC_TRUE );
- add_integer( "tls-cache-expiration", CACHE_EXPIRATION, NULL,
+ add_integer( "gnutls-cache-expiration", CACHE_EXPIRATION, NULL,
CACHE_EXPIRATION_TEXT, CACHE_EXPIRATION_LONGTEXT, VLC_TRUE );
- add_integer( "tls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT,
+ add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT,
CACHE_SIZE_LONGTEXT, VLC_TRUE );
vlc_module_end();
} tls_client_sys_t;
-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:
+#if ! defined(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:
+#if defined(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));
+#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 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) )
-
-/*****************************************************************************
- * tls_Send:
- *****************************************************************************
+/**
* Sends data through a TLS session.
- *****************************************************************************/
+ */
static int
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 )
{
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;
}
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;
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 *p_session )
+gnutls_HandshakeAndValidate( tls_session_t *session )
{
- int val;
+ int val = gnutls_ContinueHandshake( session );
+ if( val )
+ return val;
- val = gnutls_ContinueHandshake( p_session );
- if( val == 0 )
- {
- unsigned status;
- gnutls_x509_crt cert;
- const gnutls_datum *p_data;
- tls_session_sys_t *p_sys;
+ tls_session_sys_t *p_sys = (tls_session_sys_t *)(session->p_sys);
- p_sys = (tls_session_sys_t *)(p_session->p_sys);
- /* certificates chain verification */
- val = gnutls_certificate_verify_peers2( p_sys->session, &status );
+ /* 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( 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, "TLS certificate verification failed : %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;
+ }
}
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;
- }
+ msg_Err( session,
+ "unknown certificate error (you found a bug in VLC)" );
- msg_Dbg( p_session, "TLS certificate verified" );
- if( p_sys->psz_hostname == NULL )
- return 0;
+ goto error;
+ }
- /* certificate (host)name verification */
- p_data = gnutls_certificate_get_peers( p_sys->session, &status );
- if( p_data == NULL )
- {
- msg_Err( p_session, "TLS peer certificate not available" );
- p_session->pf_close( p_session );
- return -1;
- }
+ /* 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;
+ }
- val = gnutls_x509_crt_init( &cert );
- if( val )
- {
- msg_Err( p_session, "x509 fatal error : %s",
- gnutls_strerror( val ) );
- p_session->pf_close( p_session );
- return -1;
- }
+ 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, 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;
- }
+ 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( gnutls_x509_crt_check_hostname( cert, p_sys->psz_hostname ) == 0 )
+ if( p_sys->psz_hostname != NULL )
+ {
+ if ( !gnutls_x509_crt_check_hostname( cert, p_sys->psz_hostname ) )
{
- msg_Err( p_session, "x509 certificate does not match \"%s\"",
+ msg_Err( session, "Certificate does not match \"%s\"",
p_sys->psz_hostname );
- gnutls_x509_crt_deinit( cert );
- p_session->pf_close( p_session );
- return -1;
+ goto crt_error;
}
+ }
+ else
+ msg_Warn( session, "Certificate and hostname were not verified" );
- gnutls_x509_crt_deinit( cert );
+ if( gnutls_x509_crt_get_expiration_time( cert ) < time( NULL ) )
+ {
+ msg_Err( session, "Certificate expired" );
+ goto crt_error;
+ }
- msg_Dbg( p_session, "x509 hostname verified" );
- return 0;
+ if( gnutls_x509_crt_get_activation_time( cert ) > time ( NULL ) )
+ {
+ msg_Err( session, "Certificate not yet valid" );
+ goto crt_error;
}
- return val;
+ 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_BeginHandshake( tls_session_t *p_session, int fd,
- const char *psz_hostname )
+ 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)(unsigned long)fd);
+ gnutls_transport_set_ptr (p_sys->session, (gnutls_transport_ptr)(intptr_t)fd);
if( psz_hostname != NULL )
{
gnutls_server_name_set( p_sys->session, GNUTLS_NAME_DNS, psz_hostname,
strlen( psz_hostname ) );
- if( get_Bool( p_session, "tls-check-hostname" ) )
+ if (var_CreateGetBool (p_session, "tls-check-hostname"))
{
p_sys->psz_hostname = strdup( psz_hostname );
if( p_sys->psz_hostname == NULL )
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 )
{
free( p_sys );
}
+
+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)
+{
+ 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
+ };
+
+ 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;
+ }
+
+ 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 )
{
gnutls_certificate_free_credentials( x509_cred );
}
-inline int
-is_regular( const char *psz_filename )
-{
-#ifdef HAVE_SYS_STAT_H
- struct stat st;
- return ( utf8_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 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 private )
+ vlc_bool_t b_priv )
{
DIR* dir;
- const char *psz_dirent;
if( *psz_dirname == '\0' )
psz_dirname = ".";
dir = utf8_opendir( psz_dirname );
if( dir == NULL )
{
- msg_Warn( p_this, "Cannot open directory (%s) : %s", psz_dirname,
+ msg_Warn( p_this, "cannot open directory (%s): %s", psz_dirname,
strerror( errno ) );
return VLC_EGENERIC;
}
-
- while( ( psz_dirent = utf8_readdir( dir ) ) != NULL )
+#ifdef S_ISLNK
+ else
{
- char *psz_filename;
- int check = asprintf( &psz_filename, "%s/%s", psz_dirname,
- psz_dirent );
- LocaleFree( psz_dirent );
- if( check == -1 )
+ 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_ENOMEM;
+ return VLC_EGENERIC;
}
+ }
+#endif
+
+ 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;
+}
+
- /* we neglect the race condition here - not security sensitive */
- if( is_regular( psz_filename ) )
+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 ) )
{
- int i;
- char *psz_localname = ToLocale( psz_filename );
-
- i = (private)
- ? gnutls_certificate_set_x509_key_file( cred, psz_localname,
- psz_filename,
- GNUTLS_X509_FMT_PEM )
- : gnutls_certificate_set_x509_trust_file( cred, psz_localname,
- GNUTLS_X509_FMT_PEM
- );
+ 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 certificate (%s) : %s",
- psz_filename, gnutls_strerror( i ) );
+ 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;
}
}
- free( psz_filename );
+ 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);
+ }
}
-
- closedir( dir );
- return VLC_SUCCESS;
+ else
+ msg_Warn( p_this, "cannot add x509 credentials (%s): %s",
+ psz_path, strerror( errno ) );
+ return VLC_EGENERIC;
}
-/*****************************************************************************
- * tls_ClientCreate:
- *****************************************************************************
- * Initializes client-side TLS session data.
- *****************************************************************************/
+
+/**
+ * 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;
- const int cert_type_priority[3] =
- {
- GNUTLS_CRT_X509,
- 0
- };
p_sys = (tls_client_sys_t *)malloc( sizeof(struct tls_client_sys_t) );
if( p_sys == 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 allocate X509 credentials : %s",
+ msg_Err( p_tls, "cannot allocate X509 credentials: %s",
gnutls_strerror( i_val ) );
goto error;
}
- if( get_Bool( p_tls, "tls-check-cert" ) )
+ if (var_CreateGetBool (p_tls, "tls-check-cert"))
{
- /* FIXME: support for changing path/using multiple paths */
- char *psz_path;
+ sprintf (path, "%s/"CONFIG_DIR"/ssl/certs", homedir);
+ gnutls_Addx509Directory ((vlc_object_t *)p_session,
+ p_sys->x509_cred, path, VLC_FALSE);
- if( asprintf( &psz_path, "%s/"CONFIG_DIR"/ssl/certs",
- p_tls->p_vlc->psz_homedir ) == -1 )
- {
- gnutls_certificate_free_credentials( p_sys->x509_cred );
- goto error;
- }
-
- gnutls_Addx509Directory( (vlc_object_t *)p_session, p_sys->x509_cred,
- psz_path, VLC_FALSE );
-
- free( psz_path );
+ 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;
- {
- /* FIXME: support for changing path/using multiple paths */
- char *psz_path;
-
- if( asprintf( &psz_path, "%s/"CONFIG_DIR"/ssl/private",
- p_tls->p_vlc->psz_homedir ) == -1 )
- {
- gnutls_certificate_free_credentials( p_sys->x509_cred );
- goto error;
- }
-
- gnutls_Addx509Directory( (vlc_object_t *)p_session, p_sys->x509_cred,
- psz_path, VLC_TRUE );
-
- free( psz_path );
- }
+ 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_certificate_free_credentials( p_sys->x509_cred );
- goto error;
- }
-
- i_val = gnutls_set_default_priority( p_sys->session.session );
- if( i_val < 0 )
- {
- msg_Err( p_tls, "Cannot set ciphers priorities : %s",
+ 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 );
goto error;
}
- i_val = gnutls_certificate_type_set_priority( p_sys->session.session,
- cert_type_priority );
- 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 );
- 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 );
- goto error;
+ goto s_error;
}
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 );
}
-/*****************************************************************************
- * TLS session resumption callbacks
- *****************************************************************************/
+/**
+ * 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;
}
-/*****************************************************************************
- * tls_ServerSessionPrepare:
- *****************************************************************************
- * Initializes server-side TLS session data.
- *****************************************************************************/
+/**
+ * Initializes a server-side TLS session.
+ */
static tls_session_t *
gnutls_ServerSessionPrepare( tls_server_t *p_server )
{
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;
- 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;
}
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" ) );
+ i_val = config_GetInt (p_server, "gnutls-dh-bits");
+ gnutls_dh_set_prime_bits (session, i_val);
/* Session resumption support */
- gnutls_db_set_cache_expiration( session, get_Int( p_server,
- "tls-cache-expiration" ) );
+ 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 );
}
-/*****************************************************************************
- * tls_ServerDelete:
- *****************************************************************************
- * Releases data allocated with tls_ServerCreate.
- *****************************************************************************/
+/**
+ * Releases data allocated with tls_ServerCreate().
+ */
static void
gnutls_ServerDelete( tls_server_t *p_server )
{
}
-/*****************************************************************************
- * 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 )
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;
}
}
-/*****************************************************************************
- * 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 )
{
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;
}
}
-/*****************************************************************************
- * 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_tls, const char *psz_cert_path,
const char *psz_key_path )
char *psz_local_key, *psz_local_cert;
int val;
- msg_Dbg( p_tls, "Creating TLS server" );
+ msg_Dbg( p_tls, "creating TLS server" );
p_sys = (tls_server_sys_t *)malloc( sizeof(struct tls_server_sys_t) );
if( p_sys == NULL )
return NULL;
- p_sys->i_cache_size = get_Int( p_tls, "tls-cache-size" );
+ 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 )
/* No certificate validation by default */
p_sys->pf_handshake2 = gnutls_ContinueHandshake;
- /* FIXME: check for errors */
vlc_mutex_init( p_server, &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;
}
LocaleFree( psz_key_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;
val = gnutls_dh_params_init( &p_sys->dh_params );
if( val >= 0 )
{
- msg_Dbg( p_server, "Computing Diffie Hellman ciphers parameters" );
+ msg_Dbg( p_server, "computing Diffie Hellman ciphers parameters" );
val = gnutls_dh_params_generate2( p_sys->dh_params,
- get_Int( p_tls, "dh-bits" ) );
+ config_GetInt( p_tls, "gnutls-dh-bits" ) );
}
if( val < 0 )
{
- msg_Err( p_server, "Cannot initialize DH cipher suites : %s",
+ msg_Err( p_server, "cannot initialize DH cipher suites: %s",
gnutls_strerror( val ) );
gnutls_certificate_free_credentials( p_sys->x509_cred );
goto error;
}
- msg_Dbg( p_server, "Ciphers parameters computed" );
+ msg_Dbg( p_server, "ciphers parameters computed" );
gnutls_certificate_set_dh_params( p_sys->x509_cred, p_sys->dh_params);
}
-/*****************************************************************************
- * 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
+ */
+
+# define NEED_THREAD_CONTEXT 1
+static vlc_object_t *__p_gcry_data;
static int gcry_vlc_mutex_init( void **p_sys )
{
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, "gnutls_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "gnutls_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 )
{
- const char *psz_version;
-
- __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 );
+ vlc_mutex_unlock( lock );
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" );
+
+ const char *psz_version = gnutls_check_version( "1.2.9" );
if( psz_version == NULL )
{
gnutls_global_deinit( );
- vlc_mutex_unlock( lock.p_address );
+ vlc_mutex_unlock( lock );
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 );
+ refs++;
+ vlc_mutex_unlock( lock );
p_tls->pf_server_create = gnutls_ServerCreate;
p_tls->pf_client_create = gnutls_ClientCreate;
/*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" );
}
- vlc_mutex_unlock( lock.p_address );
+ vlc_mutex_unlock( lock );
}
projects / vlc / blobdiff