/*****************************************************************************
* tls.c
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: httpd.c 8263 2004-07-24 09:06:58Z courmisch $
+ * Copyright (C) 2004-2005 the VideoLAN team
+ * $Id$
*
- * Authors: Remi Denis-Courmont <courmisch@via.ecp.fr>
+ * Authors: Remi Denis-Courmont <rem # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "vlc_tls.h"
+static tls_t *
+tls_Init( vlc_object_t *p_this )
+{
+ tls_t *p_tls;
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "tls_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "tls_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+
+ p_tls = vlc_object_find( p_this, VLC_OBJECT_TLS, FIND_ANYWHERE );
+
+ if( p_tls == NULL )
+ {
+ p_tls = vlc_object_create( p_this, VLC_OBJECT_TLS );
+ if( p_tls == NULL )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ return NULL;
+ }
+
+ p_tls->p_module = module_Need( p_tls, "tls", 0, 0 );
+ if( p_tls->p_module == NULL )
+ {
+ msg_Err( p_tls, "TLS/SSL provider not found" );
+ vlc_mutex_unlock( lockval.p_address );
+ vlc_object_destroy( p_tls );
+ return NULL;
+ }
+
+ vlc_object_attach( p_tls, p_this->p_vlc );
+ vlc_object_yield( p_tls );
+ msg_Dbg( p_tls, "TLS/SSL provider initialized" );
+ }
+ vlc_mutex_unlock( lockval.p_address );
+
+ return p_tls;
+}
+
+static void
+tls_Deinit( tls_t *p_tls )
+{
+ int i;
+ vlc_value_t lockval;
-/*
- * TODO:
- * - client side stuff,
- * - server-side client cert validation,
- * - client-side server cert validation (?).
- */
+ var_Get( p_tls->p_libvlc, "tls_mutex", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+
+ vlc_object_release( p_tls );
+
+ i = p_tls->i_refcount;
+ if( i == 0 )
+ vlc_object_detach( p_tls );
+
+ vlc_mutex_unlock( lockval.p_address );
+
+ if( i == 0 )
+ {
+ module_Unneed( p_tls, p_tls->p_module );
+ msg_Dbg( p_tls, "TLS/SSL provider deinitialized" );
+ vlc_object_destroy( p_tls );
+ }
+}
/*****************************************************************************
* tls_ServerCreate:
tls_t *p_tls;
tls_server_t *p_server;
- p_tls = vlc_object_create( p_this, VLC_OBJECT_TLS );
- vlc_object_attach( p_tls, p_this );
+ p_tls = tls_Init( p_this );
+ if( p_tls == NULL )
+ return NULL;
- p_tls->p_module = module_Need( p_tls, "tls", 0, 0 );
- if( p_tls->p_module != NULL )
- {
- if( psz_key == NULL )
- psz_key = psz_cert;
+ if( psz_key == NULL )
+ psz_key = psz_cert;
- p_server = __tls_ServerCreate( p_tls, psz_cert, psz_key );
- if( p_server != NULL )
- {
- msg_Dbg( p_this, "TLS/SSL provider initialized" );
- return p_server;
- }
- else
- msg_Err( p_this, "TLS/SSL provider error" );
- module_Unneed( p_tls, p_tls->p_module );
+ p_server = p_tls->pf_server_create( p_tls, psz_cert, psz_key );
+ if( p_server != NULL )
+ {
+ msg_Dbg( p_tls, "TLS/SSL server initialized" );
+ return p_server;
}
else
- msg_Err( p_this, "TLS/SSL provider not found" );
+ msg_Err( p_tls, "TLS/SSL server error" );
- vlc_object_detach( p_tls );
- vlc_object_destroy( p_tls );
+ tls_Deinit( p_tls );
return NULL;
}
/*****************************************************************************
* tls_ServerDelete:
*****************************************************************************
- * Releases data allocated with tls_ServerCreate
+ * Releases data allocated with tls_ServerCreate.
*****************************************************************************/
void
tls_ServerDelete( tls_server_t *p_server )
{
- tls_t *p_tls = p_server->p_tls;
+ tls_t *p_tls = (tls_t *)p_server->p_parent;
- __tls_ServerDelete( p_server );
+ p_server->pf_delete( p_server );
- module_Unneed( p_tls, p_tls->p_module );
- vlc_object_detach( p_tls );
- vlc_object_destroy( p_tls );
+ tls_Deinit( p_tls );
}
/*****************************************************************************
* tls_ClientCreate:
*****************************************************************************
- * Allocates a client's TLS credentials.
- * Returns NULL on error.
+ * Allocates a client's TLS credentials and shakes hands through the network.
+ * Returns NULL on error. This is a blocking network operation.
*****************************************************************************/
tls_session_t *
-tls_ClientCreate( vlc_object_t *p_this, const char *psz_ca )
+tls_ClientCreate( vlc_object_t *p_this, int fd, const char *psz_hostname )
{
tls_t *p_tls;
tls_session_t *p_session;
- p_tls = vlc_object_create( p_this, VLC_OBJECT_TLS );
- vlc_object_attach( p_tls, p_this );
-
- p_tls->p_module = module_Need( p_tls, "tls", 0, 0 );
- if( p_tls->p_module != NULL )
+ p_tls = tls_Init( p_this );
+ if( p_tls == NULL )
+ return NULL;
+
+ p_session = p_tls->pf_client_create( p_tls );
+ if( p_session != NULL )
{
- p_session = __tls_ClientCreate( p_tls, psz_ca );
- if( p_session != NULL )
+ int i_val;
+
+ for( i_val = tls_ClientSessionHandshake( p_session, fd,
+ psz_hostname );
+ i_val > 0;
+ i_val = tls_SessionContinueHandshake( p_session ) );
+
+ if( i_val == 0 )
{
- msg_Dbg( p_this, "TLS/SSL provider initialized" );
+ msg_Dbg( p_this, "TLS/SSL client initialized" );
return p_session;
}
- else
- msg_Err( p_this, "TLS/SSL provider error" );
- module_Unneed( p_tls, p_tls->p_module );
+ msg_Err( p_this, "TLS/SSL session handshake error" );
}
else
- msg_Err( p_this, "TLS/SSL provider not found" );
+ msg_Err( p_this, "TLS/SSL client error" );
- vlc_object_detach( p_tls );
- vlc_object_destroy( p_tls );
+ tls_Deinit( p_tls );
return NULL;
}
/*****************************************************************************
* tls_ClientDelete:
*****************************************************************************
- * Releases data allocated with tls_ClientCreate
+ * Releases data allocated with tls_ClientCreate.
*****************************************************************************/
void
tls_ClientDelete( tls_session_t *p_session )
{
- tls_t *p_tls = p_session->p_tls;
+ tls_t *p_tls = (tls_t *)p_session->p_parent;
- __tls_ClientDelete( p_session );
+ p_session->pf_close( p_session );
- module_Unneed( p_tls, p_tls->p_module );
- vlc_object_detach( p_tls );
- vlc_object_destroy( p_tls );
+ tls_Deinit( p_tls );
}
projects / vlc / blobdiff