/*****************************************************************************
* update.c: VLC update checking and downloading
*****************************************************************************
- * Copyright © 2005-2007 the VideoLAN team
+ * Copyright © 2005-2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
-
+/*
+ * XXX: should use v4 signatures for binary files (already used for public key)
+ */
/**
* \file
- * This file contains functions related to VLC and plugins update management
+ * This file contains functions related to VLC update management
*/
-/* TODO: pgp verification of the status file, and downloaded binaries */
-
/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#ifdef UPDATE_CHECK
#include <assert.h>
#include <vlc_update.h>
+#include <vlc_pgpkey.h>
#include <vlc_stream.h>
#include <vlc_interface.h>
+
/*****************************************************************************
* Misc defines
*****************************************************************************/
* * Z is the revision number
* * e is an OPTIONAL extra letter
* * AKA "0.8.6d" or "0.9.0"
- * Second line is an url to the last binary
+ * Second line is an url of the binary for this last version
* Third line is a description of the update (it MAY be extended to several lines, but for now it is only one line)
*/
* Local Prototypes
*****************************************************************************/
static void EmptyRelease( update_t *p_update );
-static void GetUpdateFile( update_t *p_update );
+static vlc_bool_t GetUpdateFile( update_t *p_update );
static int CompareReleases( const struct update_release_t *p1,
const struct update_release_t *p2 );
static char * size_str( long int l_size );
/* number of data bytes in a MPI */
#define mpi_len( mpi ) ( ( scalar_number( mpi, 2 ) + 7 ) / 8 )
-/*
+/*
* fill a public_key_packet_t structure from public key packet data
* verify that it is a version 4 public key packet, using DSA
*/
static int parse_public_key_packet( public_key_packet_t *p_key, uint8_t *p_buf,
size_t i_packet_len )
{
- if( i_packet_len != 418 )
+ if( i_packet_len > 418 )
return VLC_EGENERIC;
p_key->version = *p_buf++;
if( p_key->algo != PUBLIC_KEY_ALGO_DSA )
return VLC_EGENERIC;
- memcpy( p_key->p, p_buf, 2+128 ); p_buf += 2+128;
- if( mpi_len( p_key->p ) != 128 )
+ int i_p_len = mpi_len( p_buf );
+ if( i_p_len > 128 )
return VLC_EGENERIC;
+ else
+ {
+ memcpy( p_key->p, p_buf, 2+i_p_len ); p_buf += 2+i_p_len;
+ if( i_p_len < 128 )
+ memmove( p_key->q, p_key->p + 2+i_p_len, 2+20 + 2+128 + 2+128 );
+ }
- memcpy( p_key->q, p_buf, 2+20 ); p_buf += 2+20;
- if( mpi_len( p_key->q ) != 20 )
+ int i_q_len = mpi_len( p_buf );
+ if( i_q_len > 20 )
return VLC_EGENERIC;
+ else
+ {
+ memcpy( p_key->q, p_buf, 2+i_q_len ); p_buf += 2+i_q_len;
+ if( i_p_len < 20 )
+ memmove( p_key->g, p_key->q + 2+i_q_len, 2+128 + 2+128 );
+ }
- memcpy( p_key->g, p_buf, 2+128 ); p_buf += 2+128;
- if( mpi_len( p_key->g ) != 128 )
+ int i_g_len = mpi_len( p_buf );
+ if( i_g_len > 128 )
return VLC_EGENERIC;
+ else
+ {
+ memcpy( p_key->g, p_buf, 2+i_g_len ); p_buf += 2+i_g_len;
+ if( i_g_len < 128 )
+ memmove( p_key->y, p_key->g + 2+i_g_len, 2+128 );
+ }
- memcpy( p_key->y, p_buf, 2+128 ); p_buf += 2+128;
- if( mpi_len( p_key->y ) != 128 )
+ int i_y_len = mpi_len( p_buf );
+ if( i_y_len > 128 )
return VLC_EGENERIC;
+ else
+ memcpy( p_key->y, p_buf, 2+i_y_len );
return VLC_SUCCESS;
}
size_t i_pos = 6;
size_t i_hashed_data_len = scalar_number( p_sig->hashed_data_len, 2 );
i_pos += i_hashed_data_len;
- if( i_pos > i_sig_len - 48 ) /* r & s are 44 bytes in total,
+ if( i_pos > i_sig_len - 48 ) /* r & s are 44 bytes in total,
* + the unhashed data length (2 bytes)
* + the hash verification (2 bytes) */
return VLC_EGENERIC;
memcpy( p_sig->hash_verification, p_buf, 2 ); p_buf += 2;
- memcpy( p_sig->r, p_buf, 22 ); p_buf += 22;
- if( mpi_len( p_sig->r ) != 20 )
+ int i_r_len = mpi_len( p_buf );
+ if( i_r_len > 20 )
{
free( p_sig->hashed_data );
free( p_sig->unhashed_data );
return VLC_EGENERIC;
}
+ else
+ {
+ memcpy( p_sig->r, p_buf, 2 + i_r_len );
+ p_buf += 2 + i_r_len;
+ }
- memcpy( p_sig->s, p_buf, 22 );
- if( mpi_len( p_sig->s ) != 20 )
+ int i_s_len = mpi_len( p_buf );
+ if( i_s_len > 20 )
{
free( p_sig->hashed_data );
free( p_sig->unhashed_data );
return VLC_EGENERIC;
}
+ else
+ {
+ memcpy( p_sig->s, p_buf, 2 + i_s_len );
+ p_buf += 2 + i_s_len;
+ }
return VLC_SUCCESS;
}
char *p_ipos = p_ibuf;
uint8_t *p_opos = p_obuf;
int i_end = 0;
-
int i_header_skipped = 0;
- while( !i_end && p_ipos < p_ibuf + i_ibuf_len )
+ while( !i_end && p_ipos < p_ibuf + i_ibuf_len && *p_ipos != '=' )
{
if( *p_ipos == '\r' || *p_ipos == '\n' )
{
p_ipos += i_line_len + 1;
continue;
}
-
+
if( !strncmp( p_ipos, "Version:", 8 ) )
{
p_ipos += i_line_len + 1;
p_ipos[i_line_len] = '\0';
p_opos += vlc_b64_decode_binary_to_buffer( p_opos,
- p_obuf - p_opos + i_obuf_len,
- p_ipos );
-
+ p_obuf - p_opos + i_obuf_len, p_ipos );
p_ipos += i_line_len + 1;
}
/*
* Download the signature associated to a document or a binary file.
- * We're given the file's url, we just append ".asc" to it and download
+ * We're given the file's url, we just append ".asc" to it and download
*/
static int download_signature( vlc_object_t *p_this,
- signature_packet_v3_t *p_sig, char *psz_url )
+ signature_packet_v3_t *p_sig,
+ const char *psz_url )
{
char *psz_sig = (char*) malloc( strlen( psz_url ) + 4 + 1 ); /* ".asc" + \0 */
if( !psz_sig )
return VLC_ENOMEM;
int64_t i_size = stream_Size( p_stream );
- if( i_size < 65 )
- {
- stream_Delete( p_stream );
- return VLC_EGENERIC;
- }
- else if( i_size == 65 ) /* binary format signature */
+ if( i_size <= 65 ) /* binary format signature */
{
+ msg_Dbg( p_this, "Downloading unarmored signature" );
int i_read = stream_Read( p_stream, p_sig, (int)i_size );
stream_Delete( p_stream );
if( i_read != i_size )
+ {
+ msg_Dbg( p_this, "Couldn't read full signature" );
return VLC_EGENERIC;
+ }
else
return VLC_SUCCESS;
}
+ msg_Dbg( p_this, "Downloading armored signature" );
char *p_buf = (char*)malloc( i_size );
if( !p_buf )
{
stream_Delete( p_stream );
return VLC_ENOMEM;
}
-
+
int i_read = stream_Read( p_stream, p_buf, (int)i_size );
stream_Delete( p_stream );
if( i_read != i_size )
{
+ msg_Dbg( p_this, "Couldn't read full signature" );
free( p_buf );
return VLC_EGENERIC;
}
-
+
int i_bytes = pgp_unarmor( p_buf, i_size, (uint8_t*)p_sig, 65 );
free( p_buf );
- if( i_bytes != 65 )
+ if( i_bytes == 0 )
+ {
+ msg_Dbg( p_this, "Unarmoring failed" );
+ return VLC_EGENERIC;
+ }
+ else if( i_bytes > 65 )
+ {
+ msg_Dbg( p_this, "Signature is too big: %d bytes", i_bytes );
return VLC_EGENERIC;
+ }
else
+ {
+ int i_r_len = mpi_len( p_sig->r );
+ if( i_r_len > 20 )
+ {
+ msg_Dbg( p_this, "Invalid signature, r number too big: %d bytes",
+ i_r_len );
+ return VLC_EGENERIC;
+ }
+ else if( i_r_len < 20 )
+ /* move s to the right place if r is less than 20 bytes */
+ memmove( p_sig->s, p_sig->r + 2 + i_r_len, 20 + 2 );
+
return VLC_SUCCESS;
+ }
}
/*
* Verify an OpenPGP signature made on some SHA-1 hash, with some DSA public key
*/
-static int verify_signature( vlc_object_t *p_this, uint8_t *p_r, uint8_t *p_s,
+static int verify_signature( uint8_t *p_r, uint8_t *p_s,
public_key_packet_t *p_key, uint8_t *p_hash )
{
/* the data to be verified (a SHA-1 hash) */
gcry_sexp_t key_sexp, hash_sexp, sig_sexp;
key_sexp = hash_sexp = sig_sexp = NULL;
- if( gcry_mpi_scan( &p, GCRYMPI_FMT_USG, p_key->p + 2, 128, NULL ) ||
- gcry_mpi_scan( &q, GCRYMPI_FMT_USG, p_key->q + 2, 20, NULL ) ||
- gcry_mpi_scan( &g, GCRYMPI_FMT_USG, p_key->g + 2, 128, NULL ) ||
- gcry_mpi_scan( &y, GCRYMPI_FMT_USG, p_key->y + 2, 128, NULL ) ||
+ int i_p_len = mpi_len( p_key->p );
+ int i_q_len = mpi_len( p_key->q );
+ int i_g_len = mpi_len( p_key->g );
+ int i_y_len = mpi_len( p_key->y );
+ if( gcry_mpi_scan( &p, GCRYMPI_FMT_USG, p_key->p + 2, i_p_len, NULL ) ||
+ gcry_mpi_scan( &q, GCRYMPI_FMT_USG, p_key->q + 2, i_q_len, NULL ) ||
+ gcry_mpi_scan( &g, GCRYMPI_FMT_USG, p_key->g + 2, i_g_len, NULL ) ||
+ gcry_mpi_scan( &y, GCRYMPI_FMT_USG, p_key->y + 2, i_y_len, NULL ) ||
gcry_sexp_build( &key_sexp, &erroff, key_sexp_s, p, q, g, y ) )
goto problem;
- if( gcry_mpi_scan( &r, GCRYMPI_FMT_USG, p_r + 2, 20, NULL ) ||
- gcry_mpi_scan( &s, GCRYMPI_FMT_USG, p_s + 2, 20, NULL ) ||
+ int i_r_len = mpi_len( p_r );
+ int i_s_len = mpi_len( p_s );
+ if( gcry_mpi_scan( &r, GCRYMPI_FMT_USG, p_r + 2, i_r_len, NULL ) ||
+ gcry_mpi_scan( &s, GCRYMPI_FMT_USG, p_s + 2, i_s_len, NULL ) ||
gcry_sexp_build( &sig_sexp, &erroff, sig_sexp_s, r, s ) )
goto problem;
- if( gcry_mpi_scan( &hash, GCRYMPI_FMT_USG, p_hash, 20, NULL ) ||
+ int i_hash_len = 20;
+ if( gcry_mpi_scan( &hash, GCRYMPI_FMT_USG, p_hash, i_hash_len, NULL ) ||
gcry_sexp_build( &hash_sexp, &erroff, hash_sexp_s, hash ) )
goto problem;
memcpy( p_key->psz_username, pos, i_packet_len );
p_key->psz_username[i_packet_len] = '\0';
break;
-
+
default:
break;
}
if( !f )
return NULL;
- uint8_t buffer[4096]; //FIXME
+ uint8_t buffer[4096];
gcry_md_hd_t hd;
if( gcry_md_open( &hd, GCRY_MD_SHA1, 0 ) )
{
fclose( f );
return NULL;
- }
+ }
size_t i_read;
while( ( i_read = fread( buffer, 1, sizeof(buffer), f ) ) > 0 )
fclose( f );
gcry_md_final( hd );
- return( (uint8_t*) gcry_md_read( hd, GCRY_MD_SHA1) );
+ uint8_t *p_tmp = (uint8_t*) gcry_md_read( hd, GCRY_MD_SHA1);
+ uint8_t *p_hash = malloc( 20 );
+ if( p_hash )
+ memcpy( p_hash, p_tmp, 20 );
+ gcry_md_close( hd );
+ return p_hash;
}
/*
static public_key_t *download_key( vlc_object_t *p_this, const uint8_t *p_longid, const uint8_t *p_signature_issuer )
{
char *psz_url;
- if( asprintf( &psz_url, "http://download.videolan.org/pub/keys/%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x.asc",
- p_longid[0], p_longid[1],
- p_longid[2], p_longid[3],
- p_longid[4], p_longid[5],
- p_longid[6], p_longid[7] ) == -1 )
+ if( asprintf( &psz_url, "http://download.videolan.org/pub/keys/%.2X%.2X%.2X%.2X%.2X%.2X%.2X%.2X.asc",
+ p_longid[0], p_longid[1], p_longid[2], p_longid[3],
+ p_longid[4], p_longid[5], p_longid[6], p_longid[7] ) == -1 )
return NULL;
stream_t *p_stream = stream_UrlNew( p_this, psz_url );
if( i_read != (int)i_size )
{
+ msg_Dbg( p_this, "Couldn't read full GPG key" );
free( p_buf );
return NULL;
}
if( i_error != VLC_SUCCESS )
{
+ msg_Dbg( p_this, "Couldn't parse GPG key" );
free( p_pkey );
return NULL;
}
gcry_md_putc( hd, (418 >> 8) & 0xff );
gcry_md_putc( hd, 418 & 0xff );
- gcry_md_write( hd, (uint8_t*)&p_pkey->key, 418 );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key, 6 ); /* version,timestamp,algo */
+
+ int i_p_len = mpi_len( p_pkey->key.p );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.p, 2 );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.p + 2, i_p_len );
+
+ int i_g_len = mpi_len( p_pkey->key.g );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.g, 2 );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.g + 2, i_g_len );
+
+ int i_q_len = mpi_len( p_pkey->key.q );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.q, 2 );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.q + 2, i_q_len );
+
+ int i_y_len = mpi_len( p_pkey->key.y );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.y, 2 );
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key.y + 2, i_y_len );
gcry_md_putc( hd, 0xb4 );
gcry_md_final( hd );
- uint8_t *p_hash = gcry_md_read( hd, GCRY_MD_SHA1);
+ uint8_t *p_tmp = gcry_md_read( hd, GCRY_MD_SHA1);
- if( p_hash[0] != p_pkey->sig.hash_verification[0] ||
- p_hash[1] != p_pkey->sig.hash_verification[1] )
+ if( !p_tmp ||
+ p_tmp[0] != p_pkey->sig.hash_verification[0] ||
+ p_tmp[1] != p_pkey->sig.hash_verification[1] )
{
- free( p_hash );
+ gcry_md_close( hd );
return NULL;
}
+ uint8_t *p_hash = malloc( 20 );
+ if( p_hash )
+ memcpy( p_hash, p_tmp, 20 );
+ gcry_md_close( hd );
return p_hash;
}
p_update->release.psz_url = NULL;
p_update->release.psz_desc = NULL;
+ p_update->p_pkey = NULL;
+
return p_update;
}
vlc_mutex_destroy( &p_update->lock );
- FREENULL( p_update->release.psz_url );
- FREENULL( p_update->release.psz_desc );
+ free( p_update->release.psz_url );
+ free( p_update->release.psz_desc );
+ free( p_update->p_pkey );
free( p_update );
}
/**
* Get the update file and parse it
- * *p_update has to be locked when calling this function
+ * p_update has to be locked when calling this function
*
* \param p_update pointer to update struct
- * \return nothing
+ * \return VLC_TRUE if the update is valid and authenticated
*/
-static void GetUpdateFile( update_t *p_update )
+static vlc_bool_t GetUpdateFile( update_t *p_update )
{
stream_t *p_stream = NULL;
int i_major = 0;
int i_revision = 0;
unsigned char extra;
char *psz_line = NULL;
+ char *psz_version_line = NULL;
p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL );
if( !p_stream )
goto error;
}
+ psz_version_line = psz_line;
/* first line : version number */
p_update->release.extra = 0;
switch( sscanf( psz_line, "%i.%i.%i%c", &i_major, &i_minor, &i_revision, &extra ) )
break;
default:
msg_Err( p_update->p_libvlc, "Update version false formated" );
- free( psz_line );
goto error;
}
}
p_update->release.psz_desc = psz_line;
+ stream_Delete( p_stream );
+ p_stream = NULL;
+
+ /* Now that we know the status is valid, we must download its signature
+ * to authenticate it */
+ signature_packet_v3_t sign;
+ if( download_signature( VLC_OBJECT( p_update->p_libvlc ), &sign,
+ UPDATE_VLC_STATUS_URL ) != VLC_SUCCESS )
+ {
+ msg_Err( p_update->p_libvlc, "Couldn't download signature of status file" );
+ goto error;
+ }
+
+ if( sign.type != BINARY_SIGNATURE && sign.type != TEXT_SIGNATURE )
+ {
+ msg_Err( p_update->p_libvlc, "Invalid signature type" );
+ goto error;
+ }
+
+ p_update->p_pkey = (public_key_t*)malloc( sizeof( public_key_t ) );
+ if( !p_update->p_pkey )
+ goto error;
+
+ if( parse_public_key( videolan_public_key, sizeof( videolan_public_key ),
+ p_update->p_pkey, NULL ) != VLC_SUCCESS )
+ {
+ msg_Err( p_update->p_libvlc, "Couldn't parse embedded public key, something went really wrong..." );
+ FREENULL( p_update->p_pkey );
+ goto error;
+ }
+
+ if( memcmp( sign.issuer_longid, videolan_public_key_longid , 8 ) != 0 )
+ {
+ msg_Dbg( p_update->p_libvlc, "Need to download the GPG key" );
+ public_key_t *p_new_pkey = download_key(
+ VLC_OBJECT(p_update->p_libvlc),
+ sign.issuer_longid, videolan_public_key_longid );
+ if( !p_new_pkey )
+ {
+ msg_Err( p_update->p_libvlc, "Couldn't download GPG key" );
+ FREENULL( p_update->p_pkey );
+ goto error;
+ }
+
+ uint8_t *p_hash = key_sign_hash( p_new_pkey );
+ if( !p_hash )
+ {
+ msg_Err( p_update->p_libvlc, "Failed to hash signature" );
+ free( p_new_pkey );
+ FREENULL( p_update->p_pkey );
+ goto error;
+ }
+
+ if( verify_signature( p_new_pkey->sig.r, p_new_pkey->sig.s,
+ &p_update->p_pkey->key, p_hash ) == VLC_SUCCESS )
+ {
+ free( p_hash );
+ msg_Info( p_update->p_libvlc, "Key authenticated" );
+ free( p_update->p_pkey );
+ p_update->p_pkey = p_new_pkey;
+ }
+ else
+ {
+ free( p_hash );
+ msg_Err( p_update->p_libvlc, "Key signature invalid !\n" );
+ goto error;
+ }
+ }
+
+ gcry_md_hd_t hd;
+ if( gcry_md_open( &hd, GCRY_MD_SHA1, 0 ) )
+ goto error_hd;
+
+ gcry_md_write( hd, psz_version_line, strlen( psz_version_line ) );
+ FREENULL( psz_version_line );
+ if( sign.type == TEXT_SIGNATURE )
+ gcry_md_putc( hd, '\r' );
+ gcry_md_putc( hd, '\n' );
+ gcry_md_write( hd, p_update->release.psz_url,
+ strlen( p_update->release.psz_url ) );
+ if( sign.type == TEXT_SIGNATURE )
+ gcry_md_putc( hd, '\r' );
+ gcry_md_putc( hd, '\n' );
+ gcry_md_write( hd, p_update->release.psz_desc,
+ strlen( p_update->release.psz_desc ) );
+ if( sign.type == TEXT_SIGNATURE )
+ gcry_md_putc( hd, '\r' );
+ gcry_md_putc( hd, '\n' );
+
+ gcry_md_putc( hd, sign.type );
+ gcry_md_write( hd, &sign.timestamp, 4 );
+
+ gcry_md_final( hd );
+
+ uint8_t *p_hash = gcry_md_read( hd, GCRY_MD_SHA1 );
+
+ if( p_hash[0] != sign.hash_verification[0] ||
+ p_hash[1] != sign.hash_verification[1] )
+ {
+ msg_Warn( p_update->p_libvlc, "Bad SHA1 hash for status file" );
+ goto error_hd;
+ }
+
+ if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash )
+ != VLC_SUCCESS )
+ {
+ msg_Err( p_update->p_libvlc, "BAD SIGNATURE for status file" );
+ goto error_hd;
+ }
+ else
+ {
+ msg_Info( p_update->p_libvlc, "Status file authenticated" );
+ gcry_md_close( hd );
+ return VLC_TRUE;
+ }
+
+error_hd:
+ gcry_md_close( hd );
error:
if( p_stream )
stream_Delete( p_stream );
+ free( psz_version_line );
+ return VLC_FALSE;
}
{
VLC_COMMON_MEMBERS
update_t *p_update;
- void (*pf_callback)( void * );
+ void (*pf_callback)( void *, vlc_bool_t );
void *p_data;
} update_check_thread_t;
* \param p_data pointer to some datas to give to the callback
* \returns nothing
*/
-void update_Check( update_t *p_update, void (*pf_callback)( void* ), void *p_data )
+void update_Check( update_t *p_update, void (*pf_callback)( void*, vlc_bool_t ), void *p_data )
{
assert( p_update );
update_check_thread_t *p_uct = vlc_object_create( p_update->p_libvlc,
sizeof( update_check_thread_t ) );
+ if( !p_uct )
+ {
+ msg_Err( p_update->p_libvlc, "out of memory" );
+ return;
+ }
+
p_uct->p_update = p_update;
p_uct->pf_callback = pf_callback;
p_uct->p_data = p_data;
void update_CheckReal( update_check_thread_t *p_uct )
{
+ vlc_bool_t b_ret;
vlc_mutex_lock( &p_uct->p_update->lock );
EmptyRelease( p_uct->p_update );
- GetUpdateFile( p_uct->p_update );
-
+ b_ret = GetUpdateFile( p_uct->p_update );
vlc_mutex_unlock( &p_uct->p_update->lock );
if( p_uct->pf_callback )
- (p_uct->pf_callback)( p_uct->p_data );
+ (p_uct->pf_callback)( p_uct->p_data, b_ret );
+
+ vlc_object_release( p_uct );
}
/**
static char *size_str( long int l_size )
{
char *psz_tmp = NULL;
+ int i_retval = 0;
if( l_size >> 30 )
- asprintf( &psz_tmp, "%.1f GB", (float)l_size/(1<<30) );
+ i_retval = asprintf( &psz_tmp, "%.1f GB", (float)l_size/(1<<30) );
else if( l_size >> 20 )
- asprintf( &psz_tmp, "%.1f MB", (float)l_size/(1<<20) );
+ i_retval = asprintf( &psz_tmp, "%.1f MB", (float)l_size/(1<<20) );
else if( l_size >> 10 )
- asprintf( &psz_tmp, "%.1f kB", (float)l_size/(1<<10) );
+ i_retval = asprintf( &psz_tmp, "%.1f kB", (float)l_size/(1<<10) );
else
- asprintf( &psz_tmp, "%ld B", l_size );
- return psz_tmp;
+ i_retval = asprintf( &psz_tmp, "%ld B", l_size );
+
+ return i_retval == -1 ? NULL : psz_tmp;
}
-/*
+/**
* Struct to launch the download in a thread
*/
typedef struct
assert( p_update );
update_download_thread_t *p_udt = vlc_object_create( p_update->p_libvlc,
- sizeof( update_download_thread_t ) );
+ sizeof( update_download_thread_t ) );
+ if( !p_udt )
+ {
+ msg_Err( p_update->p_libvlc, "out of memory" );
+ return;
+ }
p_udt->p_update = p_update;
p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
vlc_thread_create( p_udt, "download update", update_DownloadReal,
VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
}
+
void update_DownloadReal( update_download_thread_t *p_udt )
{
int i_progress = 0;
if( !p_stream )
{
msg_Err( p_udt, "Failed to open %s for reading", p_update->release.psz_url );
- goto error;
+ goto end;
}
/* Get the stream size */
if( !psz_tmpdestfile )
{
msg_Err( p_udt, "The URL %s is false formated", p_update->release.psz_url );
- goto error;
+ goto end;
}
psz_tmpdestfile++;
if( asprintf( &psz_destfile, "%s%s", psz_destdir, psz_tmpdestfile ) == -1 )
- goto error;
+ goto end;
p_file = utf8_fopen( psz_destfile, "w" );
if( !p_file )
{
msg_Err( p_udt, "Failed to open %s for writing", psz_destfile );
- goto error;
+ goto end;
}
/* Create a buffer and fill it with the downloaded file */
p_buffer = (void *)malloc( 1 << 10 );
if( !p_buffer )
- goto error;
+ goto end;
psz_size = size_str( l_size );
- if( asprintf( &psz_status, "%s\nDownloading... O.O/%s %.1f%% done", p_update->release.psz_url, psz_size, 0.0 ) != -1 )
+ if( asprintf( &psz_status, "%s\nDownloading... O.O/%s %.1f%% done",
+ p_update->release.psz_url, psz_size, 0.0 ) != -1 )
{
i_progress = intf_UserProgress( p_udt, "Downloading ...", psz_status, 0.0, 0 );
free( psz_status );
while( ( i_read = stream_Read( p_stream, p_buffer, 1 << 10 ) ) &&
!intf_ProgressIsCancelled( p_udt, i_progress ) )
{
- fwrite( p_buffer, i_read, 1, p_file );
+ if( fwrite( p_buffer, i_read, 1, p_file ) < 1 )
+ {
+ msg_Err( p_udt, "Failed to write into %s", psz_destfile );
+ break;
+ }
l_downloaded += i_read;
psz_downloaded = size_str( l_downloaded );
f_progress = 100.0*(float)l_downloaded/(float)l_size;
- if( asprintf( &psz_status, "%s\nDonwloading... %s/%s %.1f%% done", p_update->release.psz_url,
- psz_size, psz_downloaded, f_progress ) != -1 )
+ if( asprintf( &psz_status, "%s\nDonwloading... %s/%s %.1f%% done",
+ p_update->release.psz_url, psz_downloaded, psz_size,
+ f_progress ) != -1 )
{
intf_ProgressUpdate( p_udt, i_progress, psz_status, f_progress, 0 );
free( psz_status );
/* Finish the progress bar or delete the file if the user had canceled */
fclose( p_file );
p_file = NULL;
+
if( !intf_ProgressIsCancelled( p_udt, i_progress ) )
{
- if( asprintf( &psz_status, "%s\nDone %s (100.0%%)", p_update->release.psz_url, psz_size ) != -1 )
+ if( asprintf( &psz_status, "%s\nDone %s (100.0%%)",
+ p_update->release.psz_url, psz_size ) != -1 )
{
intf_ProgressUpdate( p_udt, i_progress, psz_status, 100.0, 0 );
free( psz_status );
}
}
else
- remove( psz_destfile );
+ {
+ utf8_unlink( psz_destfile );
+ goto end;
+ }
-error:
+ signature_packet_v3_t sign;
+ if( download_signature( VLC_OBJECT( p_udt ), &sign,
+ p_update->release.psz_url ) != VLC_SUCCESS )
+ {
+ utf8_unlink( psz_destfile );
+
+ intf_UserFatal( p_udt, VLC_TRUE, _("File can not be verified"),
+ _("It was not possible to download a cryptographic signature for "
+ "downloaded file \"%s\", and so VLC deleted it."),
+ psz_destfile );
+ msg_Err( p_udt, "Couldn't download signature of downloaded file" );
+ goto end;
+ }
+
+ if( memcmp( sign.issuer_longid, p_update->p_pkey->longid, 8 ) )
+ {
+ utf8_unlink( psz_destfile );
+ msg_Err( p_udt, "Invalid signature issuer" );
+ intf_UserFatal( p_udt, VLC_TRUE, _("Invalid signature"),
+ _("The cryptographic signature for downloaded file \"%s\" was "
+ "invalid and couldn't be used to securely verify it, and so "
+ "VLC deleted it."),
+ psz_destfile );
+ goto end;
+ }
+
+ if( sign.type != BINARY_SIGNATURE )
+ {
+ utf8_unlink( psz_destfile );
+ msg_Err( p_udt, "Invalid signature type" );
+ intf_UserFatal( p_udt, VLC_TRUE, _("Invalid signature"),
+ _("The cryptographic signature for downloaded file \"%s\" was "
+ "invalid and couldn't be used to securely verify it, and so "
+ "VLC deleted it."),
+ psz_destfile );
+ goto end;
+ }
+
+ uint8_t *p_hash = hash_sha1_from_file( psz_destfile, &sign );
+ if( !p_hash )
+ {
+ msg_Err( p_udt, "Unable to hash %s", psz_destfile );
+ utf8_unlink( psz_destfile );
+ intf_UserFatal( p_udt, VLC_TRUE, _("File not verifiable"),
+ _("It was not possible to securely verify downloaded file \"%s\", "
+ "and so VLC deleted it."),
+ psz_destfile );
+
+ goto end;
+ }
+
+ if( p_hash[0] != sign.hash_verification[0] ||
+ p_hash[1] != sign.hash_verification[1] )
+ {
+ utf8_unlink( psz_destfile );
+ intf_UserFatal( p_udt, VLC_TRUE, _("File corrupted"),
+ _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."),
+ psz_destfile );
+ msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile );
+ free( p_hash );
+ goto end;
+ }
+
+ if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash )
+ != VLC_SUCCESS )
+ {
+ utf8_unlink( psz_destfile );
+ intf_UserFatal( p_udt, VLC_TRUE, _("File corrupted"),
+ _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."),
+ psz_destfile );
+ msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile );
+ free( p_hash );
+ goto end;
+ }
+
+ msg_Info( p_udt, "%s authenticated", psz_destfile );
+ free( p_hash );
+
+end:
if( p_stream )
stream_Delete( p_stream );
if( p_file )
free( psz_destfile );
free( p_buffer );
free( psz_size );
+
+ vlc_object_release( p_udt );
}
#endif
projects / vlc / blobdiff