* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/*
- * TODO:
- * - fix FIXMEs
- */
-
-
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <errno.h>
-#include <vlc/vlc.h>
+#include <time.h>
#include <sys/types.h>
#include <errno.h>
#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
-# ifdef HAVE_UNISTD_H
-# include <unistd.h>
-# endif
#endif
+#ifdef WIN32
+# include <io.h>
+#else
+# include <unistd.h>
+#endif
+# include <fcntl.h>
-#include "vlc_tls.h"
-#include "charset.h"
+#include <vlc_tls.h>
+#include <vlc_charset.h>
+#include <vlc_block.h>
#include <gcrypt.h>
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-#define DH_BITS 1024
-#define CACHE_EXPIRATION 3600
+#include <vlc_gcrypt.h>
+
+#define CACHE_TIMEOUT 3600
#define CACHE_SIZE 64
+#include "dhparams.h"
+
+#include <assert.h>
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
+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 DH_BITS_TEXT N_("Diffie-Hellman prime bits")
-#define DH_BITS_LONGTEXT N_( \
- "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_( \
+#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." )
"This is the maximum number of resumed TLS sessions that " \
"the cache will hold." )
-#define CHECK_CERT_TEXT N_("Check TLS/SSL server certificate validity")
-#define CHECK_CERT_LONGTEXT N_( \
- "This ensures that the server certificate is valid " \
- "(i.e. signed by an approved Certification Authority)." )
-
-#define CHECK_HOSTNAME_TEXT N_("Check TLS/SSL server hostname in certificate")
-#define CHECK_HOSTNAME_LONGTEXT N_( \
- "This ensures that the server hostname in certificate matches the " \
- "requested host name." )
-
-vlc_module_begin();
- set_shortname( "GnuTLS" );
- set_description( _("GnuTLS TLS encryption layer") );
- set_capability( "tls", 1 );
- set_callbacks( Open, Close );
- set_category( CAT_ADVANCED );
- set_subcategory( SUBCAT_ADVANCED_MISC );
-
- add_bool( "tls-check-cert", VLC_TRUE, NULL, CHECK_CERT_TEXT,
- CHECK_CERT_LONGTEXT, VLC_FALSE );
- add_bool( "tls-check-hostname", VLC_TRUE, NULL, CHECK_HOSTNAME_TEXT,
- CHECK_HOSTNAME_LONGTEXT, VLC_FALSE );
-
- add_integer( "gnutls-dh-bits", DH_BITS, NULL, DH_BITS_TEXT,
- DH_BITS_LONGTEXT, VLC_TRUE );
- add_integer( "gnutls-cache-expiration", CACHE_EXPIRATION, NULL,
- CACHE_EXPIRATION_TEXT, CACHE_EXPIRATION_LONGTEXT, VLC_TRUE );
- add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT,
- CACHE_SIZE_LONGTEXT, VLC_TRUE );
-vlc_module_end();
-
+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 )
+ 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;
+};
/**
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;
}
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 <fd>.
- * 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
#ifdef WIN32
msg_Dbg( p_session, "Winsock error %d", WSAGetLastError( ) );
#endif
- msg_Err( p_session, "TLS handshake failed: %s",
+ 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;
}
+
+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_VerifyHostname( vlc_object_t *p_this, gnutls_session session,
- const char *psz_hostname )
+gnutls_HandshakeAndValidate( tls_session_t *session )
{
- const gnutls_datum *p_data;
- gnutls_x509_crt cert;
+ int val = gnutls_ContinueHandshake( session );
+ if( val )
+ return val;
+
+ tls_session_sys_t *p_sys = (tls_session_sys_t *)(session->p_sys);
+
+ /* certificates chain verification */
unsigned status;
- int val;
+ val = gnutls_certificate_verify_peers2( p_sys->session, &status );
- /* certificate (host)name verification */
- p_data = gnutls_certificate_get_peers( session, &status );
- if( p_data == NULL )
+ if( val )
{
- msg_Err( p_this, "TLS peer certificate not available" );
+ msg_Err( session, "Certificate verification failed: %s",
+ gnutls_strerror( val ) );
return -1;
}
- val = gnutls_x509_crt_init( &cert );
- if( val )
+ if( status )
{
- msg_Err( p_this, "x509 fatal error: %s", gnutls_strerror( val ) );
+ msg_Err( session, "TLS session: access denied" );
+ for( const error_msg_t *e = cert_errors; e->flag; e++ )
+ {
+ if( status & e->flag )
+ {
+ msg_Err( session, "%s", e->msg );
+ status &= ~e->flag;
+ }
+ }
+
+ if( status )
+ msg_Err( session,
+ "unknown certificate error (you found a bug in VLC)" );
+
return -1;
}
- val = gnutls_x509_crt_import( cert, p_data, GNUTLS_X509_FMT_DER );
- if( val )
+ /* certificate (host)name verification */
+ const gnutls_datum_t *data;
+ data = gnutls_certificate_get_peers (p_sys->session, &(unsigned){0});
+ if( data == NULL )
{
- msg_Err( p_this, "x509 certificate import error: %s",
- gnutls_strerror( val ) );
- gnutls_x509_crt_deinit( cert );
+ msg_Err( session, "Peer certificate not available" );
return -1;
}
- if( gnutls_x509_crt_check_hostname( cert, psz_hostname ) == 0 )
+ gnutls_x509_crt_t cert;
+ val = gnutls_x509_crt_init( &cert );
+ if( val )
{
- msg_Err( p_this, "x509 certificate does not match \"%s\"",
- psz_hostname );
- gnutls_x509_crt_deinit( cert );
+ msg_Err( session, "x509 fatal error: %s", gnutls_strerror( val ) );
return -1;
}
- gnutls_x509_crt_deinit( cert );
- msg_Dbg( p_this, "x509 hostname matches %s", psz_hostname );
- return 0;
-}
-
-static int
-gnutls_HandshakeAndValidate( tls_session_t *p_session )
-{
- int val;
-
- val = gnutls_ContinueHandshake( p_session );
- if( val == 0 )
+ val = gnutls_x509_crt_import( cert, data, GNUTLS_X509_FMT_DER );
+ if( val )
{
- unsigned status;
- tls_session_sys_t *p_sys;
-
- p_sys = (tls_session_sys_t *)(p_session->p_sys);
- /* certificates chain verification */
- val = gnutls_certificate_verify_peers2( p_sys->session, &status );
+ msg_Err( session, "Certificate import error: %s",
+ gnutls_strerror( val ) );
+ goto error;
+ }
- if( val )
- {
- msg_Err( p_session, "TLS certificate verification failed: %s",
- gnutls_strerror( val ) );
- p_session->pf_close( p_session );
- return -1;
- }
+ 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;
+ }
- 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;
- }
+ if( gnutls_x509_crt_get_expiration_time( cert ) < time( NULL ) )
+ {
+ msg_Err( session, "Certificate expired" );
+ goto error;
+ }
- msg_Dbg( p_session, "TLS certificate verified" );
- if( ( p_sys->psz_hostname != NULL )
- && gnutls_VerifyHostname( (vlc_object_t *)p_session, p_sys->session,
- p_sys->psz_hostname ) )
- {
- p_session->pf_close( p_session );
- return -1;
- }
- return 0;
+ if( gnutls_x509_crt_get_activation_time( cert ) > time ( NULL ) )
+ {
+ msg_Err( session, "Certificate not yet valid" );
+ goto error;
}
- return val;
+ gnutls_x509_crt_deinit( cert );
+ msg_Dbg( session, "TLS/x509 certificate verified" );
+ return 0;
+
+error:
+ gnutls_x509_crt_deinit( cert );
+ return -1;
}
/**
- * Starts negociation of a TLS session.
+ * Sets the operating system file descriptor backend for the TLS sesison.
*
* @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 )
+static void
+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);
+ gnutls_transport_set_ptr (p_session->p_sys->session,
+ (gnutls_transport_ptr_t)(intptr_t)fd);
+}
- gnutls_transport_set_ptr (p_sys->session, (gnutls_transport_ptr)(intptr_t)fd);
+typedef int (*tls_prio_func) (gnutls_session_t, const int *);
- if( psz_hostname != NULL )
+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)
{
- 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 (obj, "cannot set %s priorities: %s", name,
+ gnutls_strerror (val));
+ return VLC_EGENERIC;
}
-
- return p_session->pf_handshake2( p_session );
+ return VLC_SUCCESS;
}
-/**
- * Terminates TLS session and releases session data.
- * You still have to close the socket yourself.
- */
-static void
-gnutls_SessionClose( tls_session_t *p_session )
-{
- 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 );
-
- vlc_object_detach( p_session );
- vlc_object_destroy( p_session );
-
- free( p_sys );
-}
-
-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_2, as of GnuTLS 2.6.5, still not ratified */
+ 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_SHA512,
+ GNUTLS_MAC_SHA384,
+ GNUTLS_MAC_SHA256,
+ 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,
+ // TODO? Camellia ciphers?
+ //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;
}
static int
gnutls_Addx509File( vlc_object_t *p_this,
- gnutls_certificate_credentials cred,
- const char *psz_path, vlc_bool_t b_priv );
+ 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 b_priv )
+ bool 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,
- strerror( errno ) );
- return VLC_EGENERIC;
+ if (errno != ENOENT)
+ {
+ msg_Err (p_this, "cannot open directory (%s): %m", psz_dirname);
+ return VLC_EGENERIC;
+ }
+
+ 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
}
#endif
- while( ( psz_dirent = utf8_readdir( dir ) ) != NULL )
+ for (;;)
{
- char *psz_filename;
- int check;
+ char *ent = utf8_readdir (dir);
+ if (ent == NULL)
+ break;
- if( ( strcmp( ".", psz_dirent ) == 0 )
- || ( strcmp( "..", psz_dirent ) == 0 ) )
+ if ((strcmp (ent, ".") == 0) || (strcmp (ent, "..") == 0))
continue;
- check = asprintf( &psz_filename, "%s/%s", psz_dirname,
- psz_dirent );
- LocaleFree( psz_dirent );
- if( check == -1 )
- 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, psz_filename, b_priv );
- free( psz_filename );
+ gnutls_Addx509File( p_this, cred, path, b_priv );
}
closedir( dir );
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 ) )
+ 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)
{
- char *psz_localname = ToLocale( psz_path );
- int i = b_priv
- ? gnutls_certificate_set_x509_key_file( cred,
- psz_localname, psz_localname, GNUTLS_X509_FMT_PEM )
- : gnutls_certificate_set_x509_trust_file( cred,
- psz_localname, GNUTLS_X509_FMT_PEM );
- LocaleFree( psz_localname );
-
- if( i < 0 )
- {
- msg_Warn( p_this, "cannot add x509 credentials (%s): %s",
- psz_path, gnutls_strerror( i ) );
- return VLC_EGENERIC;
- }
- else
- {
- msg_Dbg( p_this, "added x509 credentials (%s)",
- psz_path );
- return VLC_SUCCESS;
- }
- }
- else if( S_ISDIR( st.st_mode ) )
- {
- msg_Dbg( p_this,
- "looking recursively for x509 credentials in %s",
- psz_path );
- return gnutls_Addx509Directory( p_this, cred, psz_path, b_priv);
+ 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): %s",
- psz_path, strerror( errno ) );
+
+ 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;
}
+/** 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;
+
+
/**
* Initializes a client-side TLS session.
*/
-static tls_session_t *
-gnutls_ClientCreate( tls_t *p_tls )
+static int OpenClient (vlc_object_t *obj)
{
- tls_session_t *p_session = NULL;
- tls_client_sys_t *p_sys = NULL;
+ tls_session_t *p_session = (tls_session_t *)obj;
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 )
- return NULL;
+ if (gnutls_Init (obj))
+ return VLC_EGENERIC;
- p_session = (struct tls_session_t *)vlc_object_create ( p_tls, sizeof(struct tls_session_t) );
- if( p_session == NULL )
+ tls_client_sys_t *p_sys = malloc (sizeof (*p_sys));
+ if (p_sys == NULL)
{
- free( p_sys );
- return NULL;
+ gnutls_Deinit (obj);
+ return VLC_ENOMEM;
}
- p_session->p_sys = p_sys;
+ 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_handshake = gnutls_BeginHandshake;
- p_session->pf_close = gnutls_ClientDelete;
-
- p_sys->session.b_handshaked = VLC_FALSE;
- p_sys->session.psz_hostname = NULL;
+ p_session->pf_set_fd = gnutls_SetFD;
- vlc_object_attach( p_session, p_tls );
+ p_sys->session.b_handshaked = false;
- i_val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred );
- if( i_val != 0 )
+ 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 ) );
+ msg_Err (obj, "cannot allocate X509 credentials: %s",
+ gnutls_strerror (i_val));
goto error;
}
- if( get_Bool( p_tls, "tls-check-cert" ) )
+ char *userdir = config_GetUserDataDir ();
+ if (userdir != NULL)
{
- char *psz_path;
-
- if( asprintf( &psz_path, "%s/"CONFIG_DIR"/ssl/certs",
- p_tls->p_vlc->psz_homedir ) != -1 )
- {
- gnutls_Addx509Directory( (vlc_object_t *)p_session,
- p_sys->x509_cred, psz_path, VLC_FALSE );
- free( psz_path );
- }
-
- if( asprintf( &psz_path, "%s/ca-certificates.crt",
- config_GetDataDir ( (vlc_object_t *)p_session) ) != -1 )
- {
- gnutls_Addx509File( (vlc_object_t *)p_session,
- p_sys->x509_cred, psz_path, VLC_FALSE );
- free( psz_path );
- }
- p_session->pf_handshake2 = gnutls_HandshakeAndValidate;
+ 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);
}
- else
- p_session->pf_handshake2 = gnutls_ContinueHandshake;
+ const char *confdir = config_GetConfDir ();
{
- 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 );
+ 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_init( &p_sys->session.session, GNUTLS_CLIENT );
- if( i_val != 0 )
+ 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 );
+ 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_set_default_priority( p_sys->session.session );
- if( i_val < 0 )
- {
- 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;
- }
+ if (gnutls_SessionPrioritize (VLC_OBJECT (p_session),
+ p_sys->session.session))
+ goto s_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;
- }
+ /* minimum DH prime bits */
+ gnutls_dh_set_prime_bits (p_sys->session.session, 1024);
- i_val = gnutls_credentials_set( p_sys->session.session,
+ 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");
+ else
+ gnutls_server_name_set (p_sys->session.session, GNUTLS_NAME_DNS,
+ servername, strlen (servername));
+ p_sys->session.psz_hostname = 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);
}
+/**
+ * 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;
}
-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;
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;
}
+/**
+ * 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.
*/
{
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) );
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 )
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;
}
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, "gnutls-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,
- "gnutls-cache-expiration" ) );
+ i_val = config_GetInt (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 );
error:
free( p_session->p_sys );
vlc_object_detach( p_session );
- vlc_object_destroy( p_session );
+ vlc_object_release( p_session );
return NULL;
}
-/**
- * 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 );
-}
-
-
/**
* Adds one or more certificate authorities.
*
* @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 )
{
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;
}
/**
* Allocates a whole server's TLS credentials.
- *
- * @return 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;
- char *psz_local_key, *psz_local_cert;
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;
-
- p_sys->i_cache_size = get_Int( 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 )
+ return VLC_ENOMEM;
+
+ p_sys->i_cache_size = config_GetInt (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)
{
- free( p_sys );
- return NULL;
- }
- p_sys->p_store = p_sys->p_cache;
-
- p_server = vlc_object_create( p_tls, sizeof(struct tls_server_t) );
- if( p_server == NULL )
- {
- free( p_sys->p_cache );
- free( p_sys );
- return NULL;
+ free (p_sys);
+ return VLC_ENOMEM;
}
- 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 );
goto error;
}
- psz_local_cert = ToLocale( psz_cert_path );
- psz_local_key = ToLocale( psz_key_path );
- val = gnutls_certificate_set_x509_key_file( p_sys->x509_cred,
+ 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_cert_path );
- LocaleFree( psz_key_path );
+ 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",
}
/* 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, "gnutls-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
+ * Destroys a TLS server object.
*/
-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 )
+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);
}
projects / vlc / blobdiff