/*****************************************************************************
- * update.c: VLC update and plugins download
+ * update.c: VLC update checking and downloading
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
- * $Id: $
+ * Copyright © 2005-2007 the VideoLAN team
+ * $Id$
*
* Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
+ * Rémi Duraffort <ivoire at via.ecp.fr>
+ Rafaël Carré <funman@videolanorg>
*
* 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
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
-/* TODO
- * --> check release types.
- * --> make sure that the version comparision method is ok.
- */
-
/**
* \file
* This file contains functions related to VLC and plugins update management
*/
+/* TODO: pgp verification of the status file, and downloaded binaries */
+
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
-#include <stdio.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <ctype.h> /* tolower() */
+#ifdef UPDATE_CHECK
+#include <assert.h>
#include <vlc_update.h>
-
-#include <vlc_block.h>
#include <vlc_stream.h>
-#include <vlc_xml.h>
#include <vlc_interface.h>
-#include <vlc_charset.h>
/*****************************************************************************
* Misc defines
*****************************************************************************/
-/* All release notes and source packages should match on "*"
- * Only binary installers are OS specific ( we only provide these
- * for Win32, Mac OS X, WincCE, beos(?) ) */
+/*
+ * Here is the format of these "status files" :
+ * First line is the last version: "X.Y.Ze" where:
+ * * X is the major number
+ * * Y is the minor number
+ * * 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
+ * Third line is a description of the update (it MAY be extended to several lines, but for now it is only one line)
+ */
+
#if defined( UNDER_CE )
-# define UPDATE_VLC_OS "*"
-# define UPDATE_VLC_ARCH "*"
+# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-ce"
#elif defined( WIN32 )
-# define UPDATE_VLC_OS "windows"
-# define UPDATE_VLC_ARCH "i386"
+# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-win-x86"
#elif defined( __APPLE__ )
-# define UPDATE_VLC_OS "macosx"
# if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
-# define UPDATE_VLC_ARCH "ppc"
+# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-mac-ppc"
# else
-# define UPDATE_VLC_ARCH "x86"
+# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-mac-x86"
# endif
#elif defined( SYS_BEOS )
-# define UPDATE_VLC_OS "beos"
-# define UPDATE_VLC_ARCH "i386"
+# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-beos-x86"
#else
-# define UPDATE_VLC_OS "*"
-# define UPDATE_VLC_ARCH "*"
+# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status"
#endif
-#define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status.xml"
-#define UPDATE_VLC_MIRRORS_URL "http://update.videolan.org/mirrors.xml"
-
-#define STRDUP( a ) ( a ? strdup( a ) : NULL )
/*****************************************************************************
* Local Prototypes
*****************************************************************************/
+static void EmptyRelease( update_t *p_update );
+static void 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 );
-void FreeMirrorsList( update_t * );
-void FreeReleasesList( update_t * );
-void GetMirrorsList( update_t *, vlc_bool_t );
-void GetFilesList( update_t *, vlc_bool_t );
-int CompareReleases( struct update_release_t *, struct update_release_t * );
-int CompareReleaseToCurrent( struct update_release_t * );
+/*****************************************************************************
+ * OpenPGP functions
+ *****************************************************************************/
-unsigned int update_iterator_Reset( update_iterator_t * );
-unsigned int update_iterator_NextFile( update_iterator_t * );
-unsigned int update_iterator_PrevFile( update_iterator_t * );
-unsigned int update_iterator_NextMirror( update_iterator_t * );
-unsigned int update_iterator_PrevMirror( update_iterator_t * );
+#define packet_type( c ) ( ( c & 0x3c ) >> 2 ) /* 0x3C = 00111100 */
+#define packet_header_len( c ) ( ( c & 0x03 ) + 1 ) /* number of bytes in a packet header */
-void update_iterator_GetData( update_iterator_t * );
-void update_iterator_ClearData( update_iterator_t * );
+static inline int scalar_number( uint8_t *p, int header_len )
+{
+ if( header_len == 1 )
+ return( p[0] );
+ else if( header_len == 2 )
+ return( (p[0] << 8) + p[1] );
+ else if( header_len == 4 )
+ return( (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] );
+ else
+ abort();
+}
-/*****************************************************************************
- * Update_t functions
- *****************************************************************************/
+/* number of data bytes in a MPI */
+#define mpi_len( mpi ) ( ( scalar_number( mpi, 2 ) + 7 ) / 8 )
-/**
- * Create a new update VLC struct
- *
- * \param p_this the calling vlc_object
- * \return pointer to new update_t or NULL
+/*
+ * fill a public_key_packet_t structure from public key packet data
+ * verify that it is a version 4 public key packet, using DSA
*/
-update_t *__update_New( vlc_object_t *p_this )
+static int parse_public_key_packet( public_key_packet_t *p_key, uint8_t *p_buf,
+ size_t i_packet_len )
{
- update_t *p_update;
+ if( i_packet_len != 418 )
+ return VLC_EGENERIC;
- if( p_this == NULL ) return NULL;
+ p_key->version = *p_buf++;
+ if( p_key->version != 4 )
+ return VLC_EGENERIC;
- p_update = (update_t *)malloc( sizeof( update_t ) );
+ /* warn when timestamp is > date ? */
+ memcpy( p_key->timestamp, p_buf, 4 ); p_buf += 4;
- vlc_mutex_init( p_this, &p_update->lock );
+ p_key->algo = *p_buf++;
+ if( p_key->algo != PUBLIC_KEY_ALGO_DSA )
+ return VLC_EGENERIC;
- p_update->p_libvlc = p_this->p_libvlc;
+ memcpy( p_key->p, p_buf, 2+128 ); p_buf += 2+128;
+ if( mpi_len( p_key->p ) != 128 )
+ return VLC_EGENERIC;
- p_update->p_releases = NULL;
- p_update->i_releases = 0;
- p_update->b_releases = VLC_FALSE;
+ memcpy( p_key->q, p_buf, 2+20 ); p_buf += 2+20;
+ if( mpi_len( p_key->q ) != 20 )
+ return VLC_EGENERIC;
- p_update->p_mirrors = NULL;
- p_update->i_mirrors = 0;
- p_update->b_mirrors = VLC_FALSE;
+ memcpy( p_key->g, p_buf, 2+128 ); p_buf += 2+128;
+ if( mpi_len( p_key->g ) != 128 )
+ return VLC_EGENERIC;
- return p_update;
+ memcpy( p_key->y, p_buf, 2+128 ); p_buf += 2+128;
+ if( mpi_len( p_key->y ) != 128 )
+ return VLC_EGENERIC;
+
+ return VLC_SUCCESS;
}
-/**
- * Delete an update_t struct
- *
- * \param p_update update_t* pointer
- * \return nothing
+/*
+ * fill a signature_packet_v4_t from signature packet data
+ * verify that it was used with a DSA public key, using SHA-1 digest
*/
-void update_Delete( update_t *p_update )
+static int parse_signature_v4_packet( signature_packet_v4_t *p_sig,
+ uint8_t *p_buf, size_t i_sig_len )
{
- vlc_mutex_destroy( &p_update->lock );
- FreeMirrorsList( p_update );
- FreeReleasesList( p_update );
- free( p_update );
+ if( i_sig_len < 54 )
+ return VLC_EGENERIC;
+
+ p_sig->version = *p_buf++;
+ if( p_sig->version != 4 )
+ return VLC_EGENERIC;
+
+ p_sig->type = *p_buf++;
+ if( p_sig->type < GENERIC_KEY_SIGNATURE ||
+ p_sig->type > POSITIVE_KEY_SIGNATURE )
+ return VLC_EGENERIC;
+
+ p_sig->public_key_algo = *p_buf++;
+ if( p_sig->public_key_algo != PUBLIC_KEY_ALGO_DSA )
+ return VLC_EGENERIC;
+
+ p_sig->digest_algo = *p_buf++;
+ if( p_sig->digest_algo != DIGEST_ALGO_SHA1 )
+ return VLC_EGENERIC;
+
+ memcpy( p_sig->hashed_data_len, p_buf, 2 ); p_buf += 2;
+
+ 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,
+ * + the unhashed data length (2 bytes)
+ * + the hash verification (2 bytes) */
+ return VLC_EGENERIC;
+
+ p_sig->hashed_data = (uint8_t*) malloc( i_hashed_data_len );
+ if( !p_sig->hashed_data )
+ return VLC_ENOMEM;
+ memcpy( p_sig->hashed_data, p_buf, i_hashed_data_len );
+ p_buf += i_hashed_data_len;
+
+ memcpy( p_sig->unhashed_data_len, p_buf, 2 ); p_buf += 2;
+
+ size_t i_unhashed_data_len = scalar_number( p_sig->unhashed_data_len, 2 );
+ i_pos += 2 + i_unhashed_data_len;
+ if( i_pos != i_sig_len - 46 )
+ {
+ free( p_sig->hashed_data );
+ return VLC_EGENERIC;
+ }
+
+ p_sig->unhashed_data = (uint8_t*) malloc( i_unhashed_data_len );
+ if( !p_sig->unhashed_data )
+ {
+ free( p_sig->hashed_data );
+ return VLC_ENOMEM;
+ }
+ memcpy( p_sig->unhashed_data, p_buf, i_unhashed_data_len );
+ p_buf += i_unhashed_data_len;
+
+ 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 )
+ {
+ free( p_sig->hashed_data );
+ free( p_sig->unhashed_data );
+ return VLC_EGENERIC;
+ }
+
+ memcpy( p_sig->s, p_buf, 22 );
+ if( mpi_len( p_sig->s ) != 20 )
+ {
+ free( p_sig->hashed_data );
+ free( p_sig->unhashed_data );
+ return VLC_EGENERIC;
+ }
+
+ return VLC_SUCCESS;
}
-/**
- * Empty the mirrors list
- * *p_update should be locked before using this function
- *
- * \param p_update pointer to the update struct
- * \return nothing
+/*
+ * crc_octets() was lamely copied from rfc 2440
+ * Copyright (C) The Internet Society (1998). All Rights Reserved.
*/
-void FreeMirrorsList( update_t *p_update )
+#define CRC24_INIT 0xB704CEL
+#define CRC24_POLY 0x1864CFBL
+
+static long crc_octets( uint8_t *octets, size_t len )
{
+ long crc = CRC24_INIT;
int i;
-
- for( i = 0; i < p_update->i_mirrors; i++ )
+ while (len--)
{
- free( p_update->p_mirrors[i].psz_name );
- free( p_update->p_mirrors[i].psz_location );
- free( p_update->p_mirrors[i].psz_type );
- free( p_update->p_mirrors[i].psz_base_url );
+ crc ^= (*octets++) << 16;
+ for (i = 0; i < 8; i++)
+ {
+ crc <<= 1;
+ if (crc & 0x1000000)
+ crc ^= CRC24_POLY;
+ }
}
- FREENULL( p_update->p_mirrors );
- p_update->i_mirrors = 0;
- p_update->b_mirrors = VLC_FALSE;
+ return crc & 0xFFFFFFL;
}
-/**
- * Empty the releases list
- * *p_update should be locked before calling this function
- *
- * \param p_update pointer to the update struct
- * \return nothing
+/*
+ * Transform an armored document in binary format
+ * Used on public keys and signatures
*/
-void FreeReleasesList( update_t *p_update )
+static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len,
+ uint8_t *p_obuf, size_t i_obuf_len )
{
- int i;
+ char *p_ipos = p_ibuf;
+ uint8_t *p_opos = p_obuf;
+ int i_end = 0;
+
+ int i_header_skipped = 0;
- for( i = 0; i < p_update->i_releases; i++ )
+ while( !i_end && p_ipos < p_ibuf + i_ibuf_len )
{
- int j;
- struct update_release_t *p_release = (p_update->p_releases + i);
- for( j = 0; j < p_release->i_files; j++ )
+ if( *p_ipos == '\r' || *p_ipos == '\n' )
+ {
+ p_ipos++;
+ continue;
+ }
+
+ size_t i_line_len = strcspn( p_ipos, "\r\n" );
+ if( i_line_len == 0 )
+ continue;
+
+ if( !i_header_skipped )
+ {
+ if( !strncmp( p_ipos, "-----BEGIN PGP", 14 ) )
+ i_header_skipped = 1;
+
+ p_ipos += i_line_len + 1;
+ continue;
+ }
+
+ if( !strncmp( p_ipos, "Version:", 8 ) )
+ {
+ p_ipos += i_line_len + 1;
+ continue;
+ }
+
+ if( p_ipos[i_line_len - 1] == '=' )
{
- free( p_release->p_files[j].psz_md5 );
- free( p_release->p_files[j].psz_url );
- free( p_release->p_files[j].psz_description );
+ i_end = 1;
+ p_ipos[i_line_len - 1] = '\0';
}
- free( p_release->psz_major );
- free( p_release->psz_minor );
- free( p_release->psz_revision );
- free( p_release->psz_extra );
- free( p_release->psz_svn_revision );
- free( p_release->p_files );
+ else
+ 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_ipos += i_line_len + 1;
}
- FREENULL( p_update->p_releases );
- p_update->i_releases = 0;
- p_update->b_releases = VLC_FALSE;
+
+ /* XXX: the CRC is OPTIONAL, really require it ? */
+ if( p_ipos + 5 > p_ibuf + i_ibuf_len || *p_ipos++ != '=' )
+ return 0;
+
+ uint8_t p_crc[3];
+ if( vlc_b64_decode_binary_to_buffer( p_crc, 3, p_ipos ) != 3 )
+ return 0;
+
+ long l_crc = crc_octets( p_obuf, p_opos - p_obuf );
+ long l_crc2 = ( 0 << 24 ) + ( p_crc[0] << 16 ) + ( p_crc[1] << 8 ) + p_crc[2];
+
+ return l_crc2 == l_crc ? p_opos - p_obuf : 0;
}
-/**
- * Get the mirrors list XML file and parse it
- * *p_update has to be unlocked when calling this function
- *
- * \param p_update pointer to the update struct
- * \param b_force set to VLC_TRUE if you want to force the mirrors list update
- * \return nothing
+/*
+ * 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
*/
-void GetMirrorsList( update_t *p_update, vlc_bool_t b_force )
+static int download_signature( vlc_object_t *p_this,
+ signature_packet_v3_t *p_sig, char *psz_url )
{
- stream_t *p_stream = NULL;
+ char *psz_sig = (char*) malloc( strlen( psz_url ) + 4 + 1 ); /* ".asc" + \0 */
+ if( !psz_sig )
+ return VLC_ENOMEM;
- xml_t *p_xml = NULL;
- xml_reader_t *p_xml_reader = NULL;
- char *psz_eltname = NULL;
- //char *psz_eltvalue = NULL;
- char *psz_name = NULL;
- char *psz_value = NULL;
- struct update_mirror_t tmp_mirror;
+ strcpy( psz_sig, psz_url );
+ strcat( psz_sig, ".asc" );
- vlc_mutex_lock( &p_update->lock );
+ stream_t *p_stream = stream_UrlNew( p_this, psz_sig );
+ free( psz_sig );
- memset( &tmp_mirror, 0, sizeof(struct update_mirror_t));
+ if( !p_stream )
+ return VLC_ENOMEM;
- if( p_update->b_mirrors && b_force == VLC_FALSE )
+ int64_t i_size = stream_Size( p_stream );
+ if( i_size < 65 )
{
- vlc_mutex_unlock( &p_update->lock );
- return;
+ stream_Delete( p_stream );
+ return VLC_EGENERIC;
}
-
- p_xml = xml_Create( p_update->p_libvlc );
- if( !p_xml )
+ else if( i_size == 65 ) /* binary format signature */
{
- msg_Err( p_update->p_libvlc, "Failed to open XML parser" );
- goto error;
+ int i_read = stream_Read( p_stream, p_sig, (int)i_size );
+ stream_Delete( p_stream );
+ if( i_read != i_size )
+ return VLC_EGENERIC;
+ else
+ return VLC_SUCCESS;
}
- p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_MIRRORS_URL );
- if( !p_stream )
+ char *p_buf = (char*)malloc( i_size );
+ if( !p_buf )
{
- msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
- UPDATE_VLC_MIRRORS_URL );
- goto error;
+ stream_Delete( p_stream );
+ return VLC_ENOMEM;
}
+
+ int i_read = stream_Read( p_stream, p_buf, (int)i_size );
- p_xml_reader = xml_ReaderCreate( p_xml, p_stream );
-
- if( !p_xml_reader )
- {
- msg_Err( p_update->p_libvlc, "Failed to open %s for parsing",
- UPDATE_VLC_MIRRORS_URL );
- goto error;
- }
+ stream_Delete( p_stream );
- if( p_update->p_mirrors )
+ if( i_read != i_size )
{
- FreeMirrorsList( p_update );
+ free( p_buf );
+ return VLC_EGENERIC;
}
+
+ int i_bytes = pgp_unarmor( p_buf, i_size, (uint8_t*)p_sig, 65 );
+ free( p_buf );
- while( xml_ReaderRead( p_xml_reader ) == 1 )
- {
- switch( xml_ReaderNodeType( p_xml_reader ) )
- {
- case -1:
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_MIRRORS_URL );
- goto error;
-
- case XML_READER_STARTELEM:
- psz_eltname = xml_ReaderName( p_xml_reader );
- if( !psz_eltname )
- {
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_MIRRORS_URL );
- goto error;
- }
+ if( i_bytes != 65 )
+ return VLC_EGENERIC;
+ else
+ return VLC_SUCCESS;
+}
- while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
- {
- psz_name = xml_ReaderName( p_xml_reader );
- psz_value = xml_ReaderValue( p_xml_reader );
-
- if( !psz_name || !psz_value )
- {
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_MIRRORS_URL );
- goto error;
- }
-
- if( !strcmp( psz_eltname, "mirror" ) )
- {
- if( !strcmp( psz_name, "name" ) )
- tmp_mirror.psz_name = STRDUP( psz_value );
- else if( !strcmp( psz_name, "location" ) )
- tmp_mirror.psz_location = STRDUP( psz_value );
- }
- else if( !strcmp( psz_eltname, "url" ) )
- {
- if( !strcmp( psz_name, "type" ) )
- tmp_mirror.psz_type = STRDUP( psz_value );
- else if( !strcmp( psz_name, "base" ) )
- tmp_mirror.psz_base_url = STRDUP( psz_value );
- }
- FREENULL( psz_name );
- FREENULL( psz_value );
- }
- if( !strcmp( psz_eltname, "url" ) )
- {
- /* append to mirrors list */
- p_update->p_mirrors =
- (struct update_mirror_t *)realloc( p_update->p_mirrors,
- (++(p_update->i_mirrors))
- *sizeof( struct update_mirror_t ) );
- p_update->p_mirrors[ p_update->i_mirrors - 1 ] =
- tmp_mirror;
- tmp_mirror.psz_name = STRDUP( tmp_mirror.psz_name );
- tmp_mirror.psz_location = STRDUP( tmp_mirror.psz_location );
- tmp_mirror.psz_type = NULL;
- tmp_mirror.psz_base_url = NULL;
- }
- FREENULL( psz_eltname );
- break;
+/*
+ * 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,
+ public_key_packet_t *p_key, uint8_t *p_hash )
+{
+ /* the data to be verified (a SHA-1 hash) */
+ const char *hash_sexp_s = "(data(flags raw)(value %m))";
+ /* the public key */
+ const char *key_sexp_s = "(public-key(dsa(p %m)(q %m)(g %m)(y %m)))";
+ /* the signature */
+ const char *sig_sexp_s = "(sig-val(dsa(r %m )(s %m )))";
+
+ size_t erroff;
+ gcry_mpi_t p, q, g, y, r, s, hash;
+ p = q = g = y = r = s = hash = NULL;
+ 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 ) ||
+ 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 ) ||
+ 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 ) ||
+ gcry_sexp_build( &hash_sexp, &erroff, hash_sexp_s, hash ) )
+ goto problem;
+
+ if( gcry_pk_verify( sig_sexp, hash_sexp, key_sexp ) )
+ goto problem;
+
+ return VLC_SUCCESS;
+
+problem:
+ if( p ) gcry_mpi_release( p );
+ if( q ) gcry_mpi_release( q );
+ if( g ) gcry_mpi_release( g );
+ if( y ) gcry_mpi_release( y );
+ if( r ) gcry_mpi_release( r );
+ if( s ) gcry_mpi_release( s );
+ if( hash ) gcry_mpi_release( hash );
+ if( key_sexp ) gcry_sexp_release( key_sexp );
+ if( sig_sexp ) gcry_sexp_release( sig_sexp );
+ if( hash_sexp ) gcry_sexp_release( hash_sexp );
+ return VLC_EGENERIC;
+}
- case XML_READER_ENDELEM:
- psz_eltname = xml_ReaderName( p_xml_reader );
- if( !psz_eltname )
- {
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_MIRRORS_URL );
- goto error;
- }
+/*
+ * Return the long id (8 bytes) of the public key used to generate a signature
+ */
+static uint8_t *get_issuer_from_signature_v4( signature_packet_v4_t *p_sig )
+{
+ uint8_t *p = p_sig->unhashed_data;
+ uint8_t *max_pos = p + scalar_number( p_sig->unhashed_data_len, 2 );
- if( !strcmp( psz_eltname, "mirror" ) )
- {
- FREENULL( tmp_mirror.psz_name );
- FREENULL( tmp_mirror.psz_location );
- }
+ while( p < max_pos )
+ {
+ int i_subpacket_len = *p < 192 ? *p++ :
+ *p < 255 ? ((*p++ - 192) << 8) + *p++ + 192 :
+ ((*++p) << 24) + (*++p << 16) + (*++p << 8) + *++p;
- FREENULL( psz_eltname );
- break;
+ if( p >= max_pos - 1 )
+ return NULL;
- /*case XML_READER_TEXT:
- psz_eltvalue = xml_ReaderValue( p_xml_reader );
- FREENULL( psz_eltvalue );
- break;*/
- }
+ if( *p == ISSUER_SUBPACKET )
+ return p+1;
+ else
+ p += i_subpacket_len;
}
-
- p_update->b_mirrors = VLC_TRUE;
-
- error:
- vlc_mutex_unlock( &p_update->lock );
-
- free( psz_eltname );
- //free( psz_eltvalue );
- free( psz_name );
- free( psz_value );
-
- free( tmp_mirror.psz_name );
- free( tmp_mirror.psz_location );
- free( tmp_mirror.psz_type );
- free( tmp_mirror.psz_base_url );
-
- if( p_xml_reader && p_xml )
- xml_ReaderDelete( p_xml, p_xml_reader );
- if( p_stream )
- stream_Delete( p_stream );
- if( p_xml )
- xml_Delete( p_xml );
+ return NULL;
}
-/**
- * Get the files list XML file and parse it
- * *p_update has to be unlocked when calling this function
- *
- * \param p_update pointer to update struct
- * \param b_force set to VLC_TRUE if you want to force the files list update
- * \return nothing
+/*
+ * fill a public_key_t with public key data, including:
+ * * public key packet
+ * * signature packet issued by key which long id is p_sig_issuer
+ * * user id packet
*/
-void GetFilesList( update_t *p_update, vlc_bool_t b_force )
+static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public_key_t *p_key, const uint8_t *p_sig_issuer )
{
- stream_t *p_stream = NULL;
+ uint8_t *pos = (uint8_t*) p_key_data;
+ uint8_t *max_pos = pos + i_key_len;
- xml_t *p_xml = NULL;
- xml_reader_t *p_xml_reader = NULL;
+ int i_status = 0;
+#define PUBLIC_KEY_FOUND 0x01
+#define USER_ID_FOUND 0x02
+#define SIGNATURE_FOUND 0X04
- char *psz_eltname = NULL;
- char *psz_eltvalue = NULL;
- char *psz_name = NULL;
- char *psz_value = NULL;
+ uint8_t *p_key_unarmored = NULL;
- struct update_release_t *p_release = NULL;
- struct update_release_t tmp_release;
- struct update_file_t tmp_file;
+ signature_packet_v4_t sig;
- vlc_bool_t b_os = VLC_FALSE, b_arch = VLC_FALSE;
+ p_key->psz_username = NULL;
+ p_key->sig.hashed_data = p_key->sig.unhashed_data = NULL;
- memset( &tmp_release, 0, sizeof(struct update_release_t) );
- memset( &tmp_file, 0, sizeof(struct update_file_t) );
+ if( !( *pos & 0x80 ) )
+ { /* first byte is ASCII, unarmoring */
+ p_key_unarmored = (uint8_t*)malloc( i_key_len );
+ if( !p_key_unarmored )
+ return VLC_ENOMEM;
+ int i_len = pgp_unarmor( (char*)p_key_data, i_key_len,
+ p_key_unarmored, i_key_len );
- tmp_release.i_type = UPDATE_RELEASE_TYPE_STABLE;
+ if( i_len == 0 )
+ goto error;
- vlc_mutex_lock( &p_update->lock );
-
- if( p_update->b_releases && b_force == VLC_FALSE )
- {
- vlc_mutex_unlock( &p_update->lock );
- return;
+ pos = p_key_unarmored;
+ max_pos = pos + i_len;
}
- p_xml = xml_Create( p_update->p_libvlc );
- if( !p_xml )
+ while( pos < max_pos )
{
- msg_Err( p_update->p_libvlc, "Failed to open XML parser" );
- goto error;
- }
+ if( !(*pos & 0x80) || *pos & 0x40 )
+ goto error;
- p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL );
- if( !p_stream )
- {
- msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
- UPDATE_VLC_STATUS_URL );
- goto error;
- }
+ int i_type = packet_type( *pos );
- p_xml_reader = xml_ReaderCreate( p_xml, p_stream );
+ int i_header_len = packet_header_len( *pos++ );
+ if( pos + i_header_len > max_pos )
+ goto error;
- if( !p_xml_reader )
- {
- msg_Err( p_update->p_libvlc, "Failed to open %s for parsing",
- UPDATE_VLC_STATUS_URL );
- goto error;
- }
+ int i_packet_len = scalar_number( pos, i_header_len );
+ pos += i_header_len;
- if( p_update->p_releases )
- {
- FreeReleasesList( p_update );
- }
+ if( pos + i_packet_len > max_pos )
+ goto error;
- while( xml_ReaderRead( p_xml_reader ) == 1 )
- {
- switch( xml_ReaderNodeType( p_xml_reader ) )
+ switch( i_type )
{
- case -1:
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_STATUS_URL );
- goto error;
-
- case XML_READER_STARTELEM:
- psz_eltname = xml_ReaderName( p_xml_reader );
- if( !psz_eltname )
- {
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_STATUS_URL );
+ uint8_t *p_issuer;
+
+ case PUBLIC_KEY_PACKET:
+ i_status |= PUBLIC_KEY_FOUND;
+ if( parse_public_key_packet( &p_key->key, pos, i_packet_len ) != VLC_SUCCESS )
goto error;
- }
+ break;
- while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS )
+ case SIGNATURE_PACKET:
+ if( !p_sig_issuer || i_status & SIGNATURE_FOUND ||
+ parse_signature_v4_packet( &sig, pos, i_packet_len ) != VLC_SUCCESS )
+ break;
+ p_issuer = get_issuer_from_signature_v4( &sig );
+ if( memcmp( p_issuer, p_sig_issuer, 8 ) == 0 )
{
- psz_name = xml_ReaderName( p_xml_reader );
- psz_value = xml_ReaderValue( p_xml_reader );
-
- if( !psz_name || !psz_value )
- {
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_STATUS_URL );
- goto error;
- }
-
- if( b_os && b_arch )
- {
- if( strcmp( psz_eltname, "version" ) == 0 )
- {
- if( !strcmp( psz_name, "major" ) )
- tmp_release.psz_major = STRDUP( psz_value );
- else if( !strcmp( psz_name, "minor" ) )
- tmp_release.psz_minor = STRDUP( psz_value );
- else if( !strcmp( psz_name, "revision" ) )
- tmp_release.psz_revision = STRDUP( psz_value );
- else if( !strcmp( psz_name, "extra" ) )
- tmp_release.psz_extra = STRDUP( psz_value );
- else if( !strcmp( psz_name, "svn" ) )
- tmp_release.psz_svn_revision =
- STRDUP( psz_value );
- else if( !strcmp( psz_name, "version" ) )
- {
- if( !strcmp( psz_value, "unstable" ) )
- tmp_release.i_type =
- UPDATE_RELEASE_TYPE_UNSTABLE;
- else if( !strcmp( psz_value, "testing" ) )
- tmp_release.i_type =
- UPDATE_RELEASE_TYPE_TESTING;
- else
- tmp_release.i_type =
- UPDATE_RELEASE_TYPE_STABLE;
- }
- }
- else if( !strcmp( psz_eltname, "file" ) )
- {
- if( !strcmp( psz_name, "type" ) )
- {
- if( !strcmp( psz_value, "info" ) )
- tmp_file.i_type = UPDATE_FILE_TYPE_INFO;
- else if( !strcmp( psz_value, "source" ) )
- tmp_file.i_type = UPDATE_FILE_TYPE_SOURCE;
- else if( !strcmp( psz_value, "binary" ) )
- tmp_file.i_type = UPDATE_FILE_TYPE_BINARY;
- else if( !strcmp( psz_value, "plugin" ) )
- tmp_file.i_type = UPDATE_FILE_TYPE_PLUGIN;
- else
- tmp_file.i_type = UPDATE_FILE_TYPE_UNDEF;
- }
- else if( !strcmp( psz_name, "md5" ) )
- tmp_file.psz_md5 = STRDUP( psz_value );
- else if( !strcmp( psz_name, "size" ) )
- tmp_file.l_size = atol( psz_value );
- else if( !strcmp( psz_name, "url" ) )
- tmp_file.psz_url = STRDUP( psz_value );
- }
- }
- if( !strcmp( psz_name, "name" )
- && ( !strcmp( psz_value, UPDATE_VLC_OS )
- || !strcmp( psz_value, "*" ) )
- && !strcmp( psz_eltname, "os" ) )
- {
- b_os = VLC_TRUE;
- }
- if( b_os && !strcmp( psz_name, "name" )
- && ( !strcmp( psz_value, UPDATE_VLC_ARCH )
- || !strcmp( psz_value, "*" ) )
- && !strcmp( psz_eltname, "arch" ) )
- {
- b_arch = VLC_TRUE;
- }
- FREENULL( psz_name );
- FREENULL( psz_value );
+ memcpy( &p_key->sig, &sig, sizeof( signature_packet_v4_t ) );
+ i_status |= SIGNATURE_FOUND;
}
- if( ( b_os && b_arch && strcmp( psz_eltname, "arch" ) ) )
+ else
{
- if( !strcmp( psz_eltname, "version" ) )
- {
- int i;
- /* look for a previous occurrence of this release */
- for( i = 0; i < p_update->i_releases; i++ )
- {
- p_release = p_update->p_releases + i;
- if( CompareReleases( p_release, &tmp_release )
- == UPDATE_RELEASE_STATUS_EQUAL )
- {
- break;
- }
- }
- /* if this is the first time that we see this release,
- * append it to the list of releases */
- if( i == p_update->i_releases )
- {
- tmp_release.i_status =
- CompareReleaseToCurrent( &tmp_release );
- p_update->p_releases =
- (struct update_release_t *)realloc( p_update->p_releases,
- (++(p_update->i_releases))*sizeof( struct update_release_t ) );
- p_update->p_releases[ p_update->i_releases - 1 ] =
- tmp_release;
- p_release =
- p_update->p_releases + p_update->i_releases - 1;
- tmp_release.psz_major = NULL;
- tmp_release.psz_minor = NULL;
- tmp_release.psz_revision = NULL;
- tmp_release.psz_extra = NULL;
- tmp_release.psz_svn_revision = NULL;
- tmp_release.i_type = UPDATE_RELEASE_TYPE_STABLE;
- tmp_release.i_status = 0;
- tmp_release.p_files = NULL;
- tmp_release.i_files = 0;
- }
- else
- {
- FREENULL( tmp_release.psz_major );
- FREENULL( tmp_release.psz_minor );
- FREENULL( tmp_release.psz_revision );
- FREENULL( tmp_release.psz_extra );
- FREENULL( tmp_release.psz_svn_revision );
- tmp_release.i_type = UPDATE_RELEASE_TYPE_STABLE;
- FREENULL( tmp_release.p_files );
- tmp_release.i_files = 0;
- }
- }
- else if( !strcmp( psz_eltname, "file" ) )
- {
- /* append file to p_release's file list */
- if( p_release == NULL )
- {
- goto error;
- }
- p_release->p_files =
- (struct update_file_t *)realloc( p_release->p_files,
- (++(p_release->i_files))*sizeof( struct update_file_t ) );
- p_release->p_files[ p_release->i_files - 1 ] = tmp_file;
- tmp_file.i_type = UPDATE_FILE_TYPE_UNDEF;
- tmp_file.psz_md5 = NULL;
- tmp_file.l_size = 0;
- tmp_file.psz_url = NULL;
- tmp_file.psz_description = NULL;
- }
+ free( sig.hashed_data );
+ free( sig.unhashed_data );
}
- FREENULL( psz_eltname );
break;
- case XML_READER_ENDELEM:
- psz_eltname = xml_ReaderName( p_xml_reader );
- if( !psz_eltname )
- {
- msg_Err( p_update->p_libvlc, "Error while parsing %s",
- UPDATE_VLC_STATUS_URL );
+ case USER_ID_PACKET:
+ if( p_key->psz_username ) /* save only the first User ID */
+ break;
+ i_status |= USER_ID_FOUND;
+ p_key->psz_username = (uint8_t*)malloc( i_packet_len + 1);
+ if( !p_key->psz_username )
goto error;
- }
- if( !strcmp( psz_eltname, "os" ) )
- b_os = VLC_FALSE;
- else if( !strcmp( psz_eltname, "arch" ) )
- b_arch = VLC_FALSE;
- FREENULL( psz_eltname );
+ memcpy( p_key->psz_username, pos, i_packet_len );
+ p_key->psz_username[i_packet_len] = '\0';
break;
-
- case XML_READER_TEXT:
- psz_eltvalue = xml_ReaderValue( p_xml_reader );
- if( p_release && p_release->i_files )
- p_release->p_files[ p_release->i_files - 1 ]
- .psz_description = STRDUP( psz_eltvalue );
- FREENULL( psz_eltvalue );
+
+ default:
break;
}
+ pos += i_packet_len;
}
+ free( p_key_unarmored );
- p_update->b_releases = VLC_TRUE;
-
- error:
- vlc_mutex_unlock( &p_update->lock );
+ if( !( i_status & ( PUBLIC_KEY_FOUND + USER_ID_FOUND ) ) )
+ return VLC_EGENERIC;
- free( psz_eltname );
- free( psz_eltvalue );
- free( psz_name );
- free( psz_value );
+ if( p_sig_issuer && !( i_status & SIGNATURE_FOUND ) )
+ return VLC_EGENERIC;
- free( tmp_release.psz_major );
- free( tmp_release.psz_minor );
- free( tmp_release.psz_revision );
- free( tmp_release.psz_extra );
- free( tmp_release.psz_svn_revision );
+ return VLC_SUCCESS;
- free( tmp_file.psz_md5 );
- free( tmp_file.psz_url );
- free( tmp_file.psz_description );
-
- if( p_xml_reader && p_xml )
- xml_ReaderDelete( p_xml, p_xml_reader );
- if( p_stream )
- stream_Delete( p_stream );
- if( p_xml )
- xml_Delete( p_xml );
+error:
+ free( p_key->sig.hashed_data );
+ free( p_key->sig.unhashed_data );
+ free( p_key->psz_username );
+ free( p_key_unarmored );
+ return VLC_EGENERIC;
}
-/**
- * Check for updates
- *
- * \param p_update pointer to update struct
- * \param b_force set to VLC_TRUE if you want to force the update
- * \returns nothing
+/*
+ * return a sha1 hash of a file
*/
-void update_Check( update_t *p_update, vlc_bool_t b_force )
+static uint8_t *hash_sha1_from_file( const char *psz_file,
+ signature_packet_v3_t *p_sig )
{
- if( p_update == NULL ) return;
- GetMirrorsList( p_update, b_force );
- GetFilesList( p_update, b_force );
-}
+ FILE *f = utf8_fopen( psz_file, "r" );
+ if( !f )
+ return NULL;
-/**
- * Compare two release numbers
- * The comparision algorith basically performs an alphabetical order (strcmp)
- * comparision of each of the version number elements until it finds two
- * different ones. This is the tricky function.
- *
- * \param p1 first release
- * \param p2 second release
- * \return like strcmp
- */
-int CompareReleases( struct update_release_t *p1, struct update_release_t *p2 )
-{
- int d;
- if( ( d = strcmp( p1->psz_major, p2->psz_major ) ) ) ;
- else if( ( d = strcmp( p1->psz_minor, p2->psz_minor ) ) ) ;
- else if( ( d = strcmp( p1->psz_revision, p2->psz_revision ) ) ) ;
- else
+ uint8_t buffer[4096]; //FIXME
+
+ gcry_md_hd_t hd;
+ if( gcry_md_open( &hd, GCRY_MD_SHA1, 0 ) )
{
- d = strcmp( p1->psz_extra, p2->psz_extra );
- if( d<0 )
- {
- /* FIXME:
- * not num < NULL < num
- * -test and -svn releases are thus always considered older than
- * -'' or -0 releases, which is the best i could come up with */
- char *psz_end1;
- char *psz_end2;
- strtol( p1->psz_extra, &psz_end1, 10 );
- strtol( p2->psz_extra, &psz_end2, 10 );
- if( psz_end2 == p2->psz_extra
- && ( psz_end1 != p1->psz_extra || *p1->psz_extra == '\0' ) )
- d = 1;
- }
- }
- if( d < 0 )
- return UPDATE_RELEASE_STATUS_OLDER;
- else if( d == 0 )
- return UPDATE_RELEASE_STATUS_EQUAL;
- else
- return UPDATE_RELEASE_STATUS_NEWER;
-}
+ fclose( f );
+ return NULL;
+ }
-/**
- * Compare a given release's version number to the current VLC's one
- *
- * \param p a release
- * \return >0 if newer, 0 if equal and <0 if older
- */
-int CompareReleaseToCurrent( struct update_release_t *p )
-{
- struct update_release_t c;
- int r;
-
- memset( &c, 0, sizeof(struct update_release_t) );
- c.psz_major = STRDUP( PACKAGE_VERSION_MAJOR );
- c.psz_minor = STRDUP( PACKAGE_VERSION_MINOR );
- c.psz_revision = STRDUP( PACKAGE_VERSION_REVISION );
- c.psz_extra = STRDUP( PACKAGE_VERSION_EXTRA );
- r = CompareReleases( p, &c );
- free( c.psz_major );
- free( c.psz_minor );
- free( c.psz_revision );
- free( c.psz_extra );
- return r;
-}
+ size_t i_read;
+ while( ( i_read = fread( buffer, 1, sizeof(buffer), f ) ) > 0 )
+ gcry_md_write( hd, buffer, i_read );
-/*****************************************************************************
- * Updatei_iterator_t functions
- *****************************************************************************/
+ gcry_md_putc( hd, p_sig->type );
+ gcry_md_write( hd, &p_sig->timestamp, 4 );
-/**
- * Create a new update iterator structure. This structure can then be used to
- * describe a position and move through the update and mirror trees/lists.
- * This will use an existing update struct or create a new one if none is
- * found
- *
- * \param p_u the calling update_t
- * \return a pointer to an update iterator
+ fclose( f );
+ gcry_md_final( hd );
+
+ return( (uint8_t*) gcry_md_read( hd, GCRY_MD_SHA1) );
+}
+
+/*
+ * download a public key (the last one) from videolan server, and parse it
*/
-update_iterator_t *update_iterator_New( update_t *p_u )
+static public_key_t *download_key( vlc_object_t *p_this, const uint8_t *p_longid, const uint8_t *p_signature_issuer )
{
- update_iterator_t *p_uit = NULL;
+ 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 )
+ return NULL;
- if( p_u == NULL )
+ stream_t *p_stream = stream_UrlNew( p_this, psz_url );
+ free( psz_url );
+ if( !p_stream )
return NULL;
- p_uit = (update_iterator_t *)malloc( sizeof( update_iterator_t ) );
- if( p_uit == NULL ) return NULL;
+ int64_t i_size = stream_Size( p_stream );
+ if( i_size < 0 )
+ {
+ stream_Delete( p_stream );
+ return NULL;
+ }
- p_uit->p_u = p_u;
+ uint8_t *p_buf = (uint8_t*)malloc( i_size );
+ if( !p_buf )
+ {
+ stream_Delete( p_stream );
+ return NULL;
+ }
- p_uit->i_m = -1;
- p_uit->i_r = -1;
- p_uit->i_f = -1;
+ int i_read = stream_Read( p_stream, p_buf, (int)i_size );
+ stream_Delete( p_stream );
- p_uit->i_t = UPDATE_FILE_TYPE_ALL;
- p_uit->i_rs = UPDATE_RELEASE_STATUS_ALL;
- p_uit->i_rt = UPDATE_RELEASE_TYPE_STABLE;
+ if( i_read != (int)i_size )
+ {
+ free( p_buf );
+ return NULL;
+ }
- p_uit->file.i_type = UPDATE_FILE_TYPE_NONE;
- p_uit->file.psz_md5 = NULL;
- p_uit->file.psz_url = NULL;
- p_uit->file.l_size = 0;
- p_uit->file.psz_description = NULL;
+ public_key_t *p_pkey = (public_key_t*) malloc( sizeof( public_key_t ) );
+ if( !p_pkey )
+ {
+ free( p_buf );
+ return NULL;
+ }
- p_uit->release.psz_version = NULL;
- p_uit->release.psz_svn_revision = NULL;
- p_uit->release.i_type = UPDATE_RELEASE_TYPE_UNSTABLE;
- p_uit->release.i_status = UPDATE_RELEASE_STATUS_NONE;
+ int i_error = parse_public_key( p_buf, i_read, p_pkey, p_signature_issuer );
+ free( p_buf );
- p_uit->mirror.psz_name = NULL;
- p_uit->mirror.psz_location = NULL;
- p_uit->mirror.psz_type = NULL;
+ if( i_error != VLC_SUCCESS )
+ {
+ free( p_pkey );
+ return NULL;
+ }
- return p_uit;
+ return p_pkey;
}
-/**
- * Delete an update iterator structure (duh!)
- *
- * \param p_uit pointer to an update iterator
- * \return nothing
+/*
+ * Generate a SHA-1 hash on a public key, to verify a signature made on that hash
+ * Note that we need the signature to compute the hash
*/
-void update_iterator_Delete( update_iterator_t *p_uit )
+static uint8_t *key_sign_hash( public_key_t *p_pkey )
{
- if( !p_uit ) return;
- update_iterator_ClearData( p_uit );
- free( p_uit );
-}
+ gcry_error_t error = 0;
+ gcry_md_hd_t hd;
-/**
- * Reset an update_iterator_t structure
- *
- * \param p_uit pointer to an update iterator
- * \return UPDATE_FAIL upon error, UPDATE_SUCCESS otherwise
- */
-unsigned int update_iterator_Reset( update_iterator_t *p_uit )
-{
- if( !p_uit ) return UPDATE_FAIL;
+ error = gcry_md_open( &hd, GCRY_MD_SHA1, 0 );
+ if( error )
+ return NULL;
- p_uit->i_r = -1;
- p_uit->i_f = -1;
- p_uit->i_m = -1;
+ gcry_md_putc( hd, 0x99 );
- update_iterator_ClearData( p_uit );
- return UPDATE_SUCCESS;
-}
+ gcry_md_putc( hd, (418 >> 8) & 0xff );
+ gcry_md_putc( hd, 418 & 0xff );
-/**
- * Finds the next file in the update tree that matches status and type
- * requirements set in the update_iterator
- *
- * \param p_uit update iterator
- * \return UPDATE_FAIL if we can't find the next file, UPDATE_SUCCESS|UPDATE_FILE if we stay in the same release, UPDATE_SUCCESS|UPDATE_RELEASE|UPDATE_FILE if we change the release index
- */
-unsigned int update_iterator_NextFile( update_iterator_t *p_uit )
-{
- int r,f=-1,old_r;
+ gcry_md_write( hd, (uint8_t*)&p_pkey->key, 418 );
- if( !p_uit ) return UPDATE_FAIL;
+ gcry_md_putc( hd, 0xb4 );
- old_r=p_uit->i_r;
+ int i_len = strlen((char*)p_pkey->psz_username);
- /* if the update iterator was already in a "no match" state, start over */
- if( p_uit->i_r == -1 ) p_uit->i_r = 0;
- //if( p_uit->i_f == -1 ) p_uit->i_f = 0;
+ gcry_md_putc( hd, (i_len << 24) & 0xff );
+ gcry_md_putc( hd, (i_len << 16) & 0xff );
+ gcry_md_putc( hd, (i_len << 8) & 0xff );
+ gcry_md_putc( hd, (i_len) & 0xff );
- vlc_mutex_lock( &p_uit->p_u->lock );
+ gcry_md_write( hd, p_pkey->psz_username, i_len );
- for( r = p_uit->i_r; r < p_uit->p_u->i_releases; r++ )
- {
- if( !( p_uit->p_u->p_releases[r].i_status & p_uit->i_rs ) ) continue;
- for( f = ( r == p_uit->i_r ? p_uit->i_f + 1 : 0 );
- f < p_uit->p_u->p_releases[r].i_files; f++ )
- {
- if( p_uit->p_u->p_releases[r].p_files[f].i_type & p_uit->i_t )
- {
- goto done;/* "double break" */
- }
- }
- }
- done:
- p_uit->i_r = r;
- p_uit->i_f = f;
+ size_t i_hashed_data_len = scalar_number( p_pkey->sig.hashed_data_len, 2 );
- r = p_uit->p_u->i_releases;
+ gcry_md_putc( hd, p_pkey->sig.version );
+ gcry_md_putc( hd, p_pkey->sig.type );
+ gcry_md_putc( hd, p_pkey->sig.public_key_algo );
+ gcry_md_putc( hd, p_pkey->sig.digest_algo );
+ gcry_md_write( hd, p_pkey->sig.hashed_data_len, 2 );
+ gcry_md_write( hd, p_pkey->sig.hashed_data, i_hashed_data_len );
- if( old_r == p_uit->i_r )
- {
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return UPDATE_SUCCESS|UPDATE_FILE;
- }
- else if( p_uit->i_r == r )
- {
- p_uit->i_r = -1;
- p_uit->i_f = -1;
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return UPDATE_FAIL;
- }
- else
+ gcry_md_putc( hd, 0x04 );
+ gcry_md_putc( hd, 0xff );
+
+ i_hashed_data_len += 6; /* hashed data + 6 bytes header */
+
+ gcry_md_putc( hd, (i_hashed_data_len << 24) & 0xff);
+ gcry_md_putc( hd, (i_hashed_data_len << 16) &0xff );
+ gcry_md_putc( hd, (i_hashed_data_len << 8) & 0xff );
+ gcry_md_putc( hd, (i_hashed_data_len) & 0xff );
+
+ gcry_md_final( hd );
+
+ uint8_t *p_hash = 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] )
{
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return UPDATE_SUCCESS|UPDATE_RELEASE|UPDATE_FILE;
+ free( p_hash );
+ return NULL;
}
+
+ return p_hash;
}
+
+/*****************************************************************************
+ * Update_t functions
+ *****************************************************************************/
+
/**
- * Finds the previous file in the update tree that matches status and type
- * requirements set in the update_iterator
+ * Create a new update VLC struct
*
- * \param p_uit update iterator
- * \return UPDATE_FAIL if we can't find the previous file, UPDATE_SUCCESS|UPDATE_FILE if we stay in the same release, UPDATE_SUCCESS|UPDATE_RELEASE|UPDATE_FILE if we change the release index
+ * \param p_this the calling vlc_object
+ * \return pointer to new update_t or NULL
*/
-//TODO: test
-unsigned int update_iterator_PrevFile( update_iterator_t *p_uit )
+update_t *__update_New( vlc_object_t *p_this )
{
- int r,f=-1,old_r;
-
- if( !p_uit ) return UPDATE_FAIL;
-
- old_r=p_uit->i_r;
+ update_t *p_update;
+ assert( p_this );
- /* if the update iterator was already in a "no match" state, start over
- * (begin at the end of the list) */
- if( p_uit->i_r == -1 ) p_uit->i_r = p_uit->p_u->i_releases - 1;
- p_uit->i_f = p_uit->p_u->p_releases[p_uit->i_r].i_files + 1;
+ p_update = (update_t *)malloc( sizeof( update_t ) );
+ if( !p_update ) return NULL;
- vlc_mutex_lock( &p_uit->p_u->lock );
+ vlc_mutex_init( p_this, &p_update->lock );
- for( r = p_uit->i_r; r >= 0; r-- )
- {
- if( !( p_uit->p_u->p_releases[r].i_status & p_uit->i_rs ) ) continue;
- for( f =( r==p_uit->i_r ? p_uit->i_f - 1 : p_uit->p_u->p_releases[r].i_files );
- f >= 0; f-- )
- {
- if( p_uit->p_u->p_releases[r].p_files[f].i_type & p_uit->i_t )
- {
- goto done;/* "double break" */
- }
- }
- }
- done:
- p_uit->i_r = r;
- p_uit->i_f = f;
+ p_update->p_libvlc = p_this->p_libvlc;
- r = p_uit->p_u->i_releases;
+ p_update->release.psz_url = NULL;
+ p_update->release.psz_desc = NULL;
- if( old_r == p_uit->i_r )
- {
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return UPDATE_SUCCESS|UPDATE_FILE;
- }
- else if( p_uit->i_r == -1 )
- {
- p_uit->i_r = -1;
- p_uit->i_f = -1;
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return UPDATE_FAIL;
- }
- else
- {
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return UPDATE_SUCCESS|UPDATE_RELEASE|UPDATE_FILE;
- }
+ return p_update;
}
/**
- * Finds the next mirror in the update tree
+ * Delete an update_t struct
*
- * \param update iterator
- * \return UPDATE_FAIL if we can't find the next mirror, UPDATE_SUCCESS|UPDATE_MIRROR otherwise
+ * \param p_update update_t* pointer
+ * \return nothing
*/
-unsigned int update_iterator_NextMirror( update_iterator_t *p_uit )
+void update_Delete( update_t *p_update )
{
- if( !p_uit ) return UPDATE_FAIL;
- vlc_mutex_lock( &p_uit->p_u->lock );
- p_uit->i_m++;
- if( p_uit->i_m >= p_uit->p_u->i_mirrors ) p_uit->i_m = -1;
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return p_uit->i_m == -1 ? UPDATE_FAIL : UPDATE_SUCCESS|UPDATE_MIRROR;
+ assert( p_update );
+
+ vlc_mutex_destroy( &p_update->lock );
+
+ FREENULL( p_update->release.psz_url );
+ FREENULL( p_update->release.psz_desc );
+
+ free( p_update );
}
/**
- * Finds the previous mirror in the update tree
+ * Empty the release struct
*
- * \param update iterator
- * \return UPDATE_FAIL if we can't find a previous mirror, UPDATE_SUCCESS|UPDATE_MIRROR otherwise
+ * \param p_update update_t* pointer
+ * \return nothing
*/
-unsigned int update_iterator_PrevMirror( update_iterator_t *p_uit )
+static void EmptyRelease( update_t *p_update )
{
- if( !p_uit ) return UPDATE_FAIL;
- vlc_mutex_lock( &p_uit->p_u->lock );
- p_uit->i_m--;
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
- return p_uit->i_m == -1 ? UPDATE_FAIL : UPDATE_SUCCESS|UPDATE_MIRROR;
+ p_update->release.i_major = 0;
+ p_update->release.i_minor = 0;
+ p_update->release.i_revision = 0;
+
+ FREENULL( p_update->release.psz_url );
+ FREENULL( p_update->release.psz_desc );
}
/**
- * Change the update iterator's position in the file and mirrors tree
- * If position is negative, don't change it
+ * Get the update file and parse it
+ * *p_update has to be locked when calling this function
*
- * \param i_m position in mirrors list
- * \param i_r position in releases list
- * \param i_f position in release's files list
- * \return UPDATE_FAIL when changing position fails or position wasn't changed, a combination of UPDATE_MIRROR, UPDATE_RELEASE and UPDATE_FILE otherwise
+ * \param p_update pointer to update struct
+ * \return nothing
*/
-unsigned int update_iterator_ChooseMirrorAndFile( update_iterator_t *p_uit,
- int i_m, int i_r, int i_f )
+static void GetUpdateFile( update_t *p_update )
{
- unsigned int i_val = 0;
-
- if( !p_uit ) return 0;
- vlc_mutex_lock( &p_uit->p_u->lock );
+ stream_t *p_stream = NULL;
+ int i_major = 0;
+ int i_minor = 0;
+ int i_revision = 0;
+ unsigned char extra;
+ char *psz_line = NULL;
- if( i_m >= 0 )
+ p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL );
+ if( !p_stream )
{
- if( i_m < p_uit->p_u->i_mirrors )
- {
- if( i_m != p_uit->i_m )
- i_val |= UPDATE_MIRROR;
- p_uit->i_m = i_m;
- }
- else i_m = -1;
+ msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
}
- if( i_r >= 0 )
+ /* Try to read three lines */
+ if( !( psz_line = stream_ReadLine( p_stream ) ) )
{
- if( i_r < p_uit->p_u->i_releases )
- {
- if( i_r != p_uit->i_r )
- i_val |= UPDATE_FILE;
- p_uit->i_r = i_r;
- }
- else i_r = -1;
+ msg_Err( p_update->p_libvlc, "Update file %s is corrupted : missing version",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
}
- if( i_f >= 0 )
+ /* first line : version number */
+ p_update->release.extra = 0;
+ switch( sscanf( psz_line, "%i.%i.%i%c", &i_major, &i_minor, &i_revision, &extra ) )
{
- if( i_r >= 0 && i_r < p_uit->p_u->i_releases
- && i_f < p_uit->p_u->p_releases[p_uit->i_r].i_files )
- {
- if( i_f != p_uit->i_f )
- i_val |= UPDATE_FILE;
- p_uit->i_f = i_f;
- }
- else i_f = -1;
+ case 4:
+ p_update->release.extra = extra;
+ case 3:
+ p_update->release.i_major = i_major;
+ p_update->release.i_minor = i_minor;
+ p_update->release.i_revision = i_revision;
+ break;
+ default:
+ msg_Err( p_update->p_libvlc, "Update version false formated" );
+ free( psz_line );
+ goto error;
}
- update_iterator_GetData( p_uit );
- vlc_mutex_unlock( &p_uit->p_u->lock );
-
- if( ( i_m < 0 || p_uit->i_m >= 0 )
- && ( i_r < 0 || p_uit->i_r >= 0 )
- && ( i_f < 0 || p_uit->i_f >= 0 ) )
+ /* Second line : URL */
+ if( !( psz_line = stream_ReadLine( p_stream ) ) )
{
- /* Everything worked */
- return UPDATE_SUCCESS|i_val;
+ msg_Err( p_update->p_libvlc, "Update file %s is corrupted : URL missing",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
}
- else
+ p_update->release.psz_url = psz_line;
+
+
+ /* Third line : description */
+ if( !( psz_line = stream_ReadLine( p_stream ) ) )
{
- /* Something failed */
- return UPDATE_FAIL;
+ msg_Err( p_update->p_libvlc, "Update file %s is corrupted : description missing",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
}
+ p_update->release.psz_desc = psz_line;
+
+error:
+ if( p_stream )
+ stream_Delete( p_stream );
}
+
/**
- * Fills the iterator data (file, release and mirror structs)
- * The update struct should be locked before calling this function.
- *
- * \param p_uit update iterator
- * \return nothing
+ * Struct to launch the check in an other thread
*/
-void update_iterator_GetData( update_iterator_t *p_uit )
+typedef struct
{
- struct update_release_t *p_r = NULL;
- struct update_file_t *p_f = NULL;
- struct update_mirror_t *p_m = NULL;
-
- update_iterator_ClearData( p_uit );
-
- if( p_uit->i_m >= 0 )
- {
- p_m = p_uit->p_u->p_mirrors + p_uit->i_m;
- p_uit->mirror.psz_name = STRDUP( p_m->psz_name );
- p_uit->mirror.psz_location = STRDUP( p_m->psz_location );
- p_uit->mirror.psz_type = STRDUP( p_m->psz_type );
- }
+ VLC_COMMON_MEMBERS
+ update_t *p_update;
+ void (*pf_callback)( void * );
+ void *p_data;
+} update_check_thread_t;
- if( p_uit->i_r >= 0 )
- {
- p_r = p_uit->p_u->p_releases + p_uit->i_r;
- asprintf( &p_uit->release.psz_version, "%s.%s.%s-%s",
- p_r->psz_major,
- p_r->psz_minor,
- p_r->psz_revision,
- p_r->psz_extra );
- p_uit->release.psz_svn_revision = STRDUP( p_r->psz_svn_revision );
- p_uit->release.i_type = p_r->i_type;
- p_uit->release.i_status = p_r->i_status;
- if( p_uit->i_f >= 0 )
- {
- p_f = p_r->p_files + p_uit->i_f;
- p_uit->file.i_type = p_f->i_type;
- p_uit->file.psz_md5 = STRDUP( p_f->psz_md5 );
- p_uit->file.l_size = p_f->l_size;
- p_uit->file.psz_description = STRDUP( p_f->psz_description);
- if( p_f->psz_url[0] == '/' )
- {
- if( p_m )
- {
- asprintf( &p_uit->file.psz_url, "%s%s",
- p_m->psz_base_url, p_f->psz_url );
- }
- }
- else
- {
- p_uit->file.psz_url = STRDUP( p_f->psz_url );
- }
- }
- }
-}
+void update_CheckReal( update_check_thread_t *p_uct );
/**
- * Clears the iterator data (file, release and mirror structs)
+ * Check for updates
*
- * \param p_uit update iterator
- * \return nothing
+ * \param p_update pointer to update struct
+ * \param pf_callback pointer to a function to call when the update_check is finished
+ * \param p_data pointer to some datas to give to the callback
+ * \returns nothing
*/
-void update_iterator_ClearData( update_iterator_t *p_uit )
+void update_Check( update_t *p_update, void (*pf_callback)( void* ), void *p_data )
{
- p_uit->file.i_type = UPDATE_FILE_TYPE_NONE;
- FREENULL( p_uit->file.psz_md5 );
- p_uit->file.l_size = 0;
- FREENULL( p_uit->file.psz_description );
- FREENULL( p_uit->file.psz_url );
- FREENULL( p_uit->release.psz_version );
- FREENULL( p_uit->release.psz_svn_revision );
- p_uit->release.i_type = UPDATE_RELEASE_TYPE_UNSTABLE;
- p_uit->release.i_status = UPDATE_RELEASE_STATUS_NONE;
- FREENULL( p_uit->mirror.psz_name );
- FREENULL( p_uit->mirror.psz_location );
- FREENULL( p_uit->mirror.psz_type );
+ assert( p_update );
+
+ update_check_thread_t *p_uct = vlc_object_create( p_update->p_libvlc,
+ sizeof( update_check_thread_t ) );
+ p_uct->p_update = p_update;
+ p_uct->pf_callback = pf_callback;
+ p_uct->p_data = p_data;
+
+ vlc_thread_create( p_uct, "check for update", update_CheckReal,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
}
-/**
- * Perform an action on the update iterator
- * Only the first matching action is performed.
- *
- * \param p_uit update iterator
- * \param i_action update action bitmask. can be a combination of UPDATE_NEXT, UPDATE_PREV, UPDATE_MIRROR, UPDATE_RELEASE, UPDATE_FILE, UPDATE_RESET
- * \return UPDATE_FAIL if action fails, UPDATE_SUCCESS|(combination of UPDATE_MIRROR, UPDATE_RELEASE and UPDATE_FILE if these changed) otherwise
- */
-unsigned int update_iterator_Action( update_iterator_t *p_uit, int i_action )
+void update_CheckReal( update_check_thread_t *p_uct )
{
- if( i_action & UPDATE_RESET )
- {
- return update_iterator_Reset( p_uit );
- }
- else
- if( i_action & UPDATE_MIRROR )
- {
- if( i_action & UPDATE_PREV )
- {
- return update_iterator_PrevMirror( p_uit );
- }
- else
- {
- return update_iterator_NextMirror( p_uit );
- }
- }
- /*else if( i_action & UPDATE_RELEASE )
- {
- if( i_action & UPDATE_PREV )
- {
- return update_iterator_PrevRelease( p_uit );
- }
- else
- {
- return update_iterator_NextRelease( p_uit );
- }
- }*/
- else if( i_action & UPDATE_FILE )
- {
- if( i_action & UPDATE_PREV )
- {
- return update_iterator_PrevFile( p_uit );
- }
- else
- {
- return update_iterator_NextFile( p_uit );
- }
- }
- else
- {
- return UPDATE_SUCCESS;
- }
+ vlc_mutex_lock( &p_uct->p_update->lock );
+
+ EmptyRelease( p_uct->p_update );
+ 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 );
}
/**
- * Object to launch download thread in a different object
+ * Compare two release numbers
+ *
+ * \param p1 first release
+ * \param p2 second release
+ * \return UpdateReleaseStatus(Older|Equal|Newer)
*/
-typedef struct {
- VLC_COMMON_MEMBERS
- char *psz_dest; //< Download destination
- char *psz_src; //< Download source
- char *psz_status; //< Download status displayed in progress dialog
-} download_thread_t;
+static int CompareReleases( const struct update_release_t *p1,
+ const struct update_release_t *p2 )
+{
+ int32_t d;
+ d = ( p1->i_major << 24 ) + ( p1->i_minor << 16 ) + ( p1->i_revision << 8 )
+ - ( p2->i_major << 24 ) - ( p2->i_minor << 16 ) - ( p2->i_revision << 8 )
+ + ( p1->extra ) - ( p2->extra );
-void update_download_for_real( download_thread_t *p_this );
+ if( d < 0 )
+ return UpdateReleaseStatusOlder;
+ else if( d == 0 )
+ return UpdateReleaseStatusEqual;
+ else
+ return UpdateReleaseStatusNewer;
+}
/**
- * Download the file selected by the update iterator. This function will
- * launch the download in a new thread (downloads can be long)
+ * Compare a given release's version number to the current VLC's one
*
- * \param p_uit update iterator
- * \param psz_dest destination file path
- * \return nothing
+ * \param p_update structure
+ * \return UpdateReleaseStatus(Older|Equal|Newer)
*/
-void update_download( update_iterator_t *p_uit, const char *psz_dest )
+int update_CompareReleaseToCurrent( update_t *p_update )
{
- download_thread_t *p_dt =
- vlc_object_create( p_uit->p_u->p_libvlc, sizeof( download_thread_t ) );
+ assert( p_update );
- p_dt->psz_dest = strdup( psz_dest );
- p_dt->psz_src = strdup( p_uit->file.psz_url );
- asprintf( &p_dt->psz_status, "%s - %s (%s)\nSource: %s\nDestination: %s",
- p_uit->file.psz_description, p_uit->release.psz_version,
- p_uit->release.psz_svn_revision, p_uit->file.psz_url,
- psz_dest);
+ struct update_release_t c;
- vlc_thread_create( p_dt, "download thread", update_download_for_real,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
+ /* get the current version number */
+ c.i_major = *PACKAGE_VERSION_MAJOR - '0';
+ c.i_minor = *PACKAGE_VERSION_MINOR - '0';
+ c.i_revision = *PACKAGE_VERSION_REVISION - '0';
+ c.extra = *PACKAGE_VERSION_EXTRA;
+
+ return CompareReleases( &p_update->release, &c );
}
/**
*/
static char *size_str( long int l_size )
{
- char *psz_tmp;
- if( l_size>> 30 )
+ char *psz_tmp = NULL;
+ if( l_size >> 30 )
asprintf( &psz_tmp, "%.1f GB", (float)l_size/(1<<30) );
- if( l_size >> 20 )
+ else if( l_size >> 20 )
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) );
return psz_tmp;
}
+
+/*
+ * Struct to launch the download in a thread
+ */
+typedef struct
+{
+ VLC_COMMON_MEMBERS
+ update_t *p_update;
+ char *psz_destdir;
+} update_download_thread_t;
+
+void update_DownloadReal( update_download_thread_t *p_udt );
+
/**
- * The true download function.
+ * Download the file given in the update_t
*
- * \param p_this the download_thread_t object
+ * \param p_update structure
+ * \param dir to store the download file
* \return nothing
*/
-void update_download_for_real( download_thread_t *p_this )
+void update_Download( update_t *p_update, char *psz_destdir )
{
- char *psz_dest = p_this->psz_dest;
- char *psz_src = p_this->psz_src;
- stream_t *p_stream;
- libvlc_int_t *p_libvlc = p_this->p_libvlc;
+ assert( p_update );
- FILE *p_file = NULL;
- void *p_buffer;
+ update_download_thread_t *p_udt = vlc_object_create( p_update->p_libvlc,
+ sizeof( update_download_thread_t ) );
- char *psz_status;
+ p_udt->p_update = p_update;
+ p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
- int i_progress;
- long int l_size, l_done = 0;
+ 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;
+ long int l_size;
+ long int l_downloaded = 0;
+ float f_progress;
+ char *psz_status = NULL;
+ char *psz_downloaded = NULL;
+ char *psz_size = NULL;
+ char *psz_destfile = NULL;
+ char *psz_tmpdestfile = NULL;
- vlc_thread_ready( p_this );
+ FILE *p_file = NULL;
+ stream_t *p_stream = NULL;
+ void* p_buffer = NULL;
+ int i_read;
- asprintf( &psz_status, "%s\nDownloading... 0.0/? %.1f%% done",
- p_this->psz_status, 0.0 );
- i_progress = intf_UserProgress( p_libvlc, "Downloading...",
- psz_status, 0.0, 0 );
+ update_t *p_update = p_udt->p_update;
+ char *psz_destdir = p_udt->psz_destdir;
- p_stream = stream_UrlNew( p_libvlc, psz_src );
+ /* Open the stream */
+ p_stream = stream_UrlNew( p_udt, p_update->release.psz_url );
if( !p_stream )
{
- msg_Err( p_libvlc, "Failed to open %s for reading", psz_src );
- intf_UserFatal( p_libvlc, VLC_TRUE, "Error while Downloading...",
- "VLC failed to open %s for reading.", psz_src );
- intf_UserHide( p_libvlc, i_progress );
+ msg_Err( p_udt, "Failed to open %s for reading", p_update->release.psz_url );
+ goto error;
}
- else
- {
- p_file = utf8_fopen( psz_dest, "w" );
- if( !p_file )
- {
- msg_Err( p_libvlc, "Failed to open %s for writing", psz_dest );
- intf_UserFatal( p_libvlc, VLC_TRUE, "Error while Downloading...",
- "VLC failed to open %s for writing.", psz_dest );
- intf_UserHide( p_libvlc, i_progress );
- }
- else
- {
- long int l_read;
- char *psz_s1; char *psz_s2;
+ /* Get the stream size */
+ l_size = stream_Size( p_stream );
- l_size = stream_Size(p_stream);
- p_buffer = (void *)malloc( 1<<10 );
+ /* Get the file name and open it*/
+ psz_tmpdestfile = strrchr( p_update->release.psz_url, '/' );
+ if( !psz_tmpdestfile )
+ {
+ msg_Err( p_udt, "The URL %s is false formated", p_update->release.psz_url );
+ goto error;
+ }
+ psz_tmpdestfile++;
+ if( asprintf( &psz_destfile, "%s%s", psz_destdir, psz_tmpdestfile ) == -1 )
+ goto error;
- while( ( l_read = stream_Read( p_stream, p_buffer, 1<<10 ) ) )
- {
- float f_progress;
+ p_file = utf8_fopen( psz_destfile, "w" );
+ if( !p_file )
+ {
+ msg_Err( p_udt, "Failed to open %s for writing", psz_destfile );
+ goto error;
+ }
- fwrite( p_buffer, l_read, 1, p_file );
+ /* Create a buffer and fill it with the downloaded file */
+ p_buffer = (void *)malloc( 1 << 10 );
+ if( !p_buffer )
+ goto error;
- l_done += l_read;
- free( psz_status );
- f_progress = 100.0*(float)l_done/(float)l_size;
- psz_s1 = size_str( l_done );
- psz_s2 = size_str( l_size );
- asprintf( &psz_status, "%s\nDownloading... %s/%s (%.1f%%) done",
- p_this->psz_status, psz_s1, psz_s2, f_progress );
- free( psz_s1 ); free( psz_s2 );
+ 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 )
+ {
+ i_progress = intf_UserProgress( p_udt, "Downloading ...", psz_status, 0.0, 0 );
+ free( psz_status );
+ }
- intf_ProgressUpdate( p_libvlc, i_progress,
- psz_status, f_progress, 0 );
- }
+ 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 );
- free( p_buffer );
- fclose( p_file );
- stream_Delete( p_stream );
+ l_downloaded += i_read;
+ psz_downloaded = size_str( l_downloaded );
+ f_progress = 100.0*(float)l_downloaded/(float)l_size;
- free( psz_status );
- psz_s2 = size_str( l_size );
- asprintf( &psz_status, "%s\nDone %s (100.00%%)",
- p_this->psz_status, psz_s2 );
- free( psz_s2 );
- intf_ProgressUpdate( p_libvlc, i_progress, psz_status, 100.0, 0 );
+ if( asprintf( &psz_status, "%s\nDonwloading... %s/%s %.1f%% done", p_update->release.psz_url,
+ psz_size, psz_downloaded, f_progress ) != -1 )
+ {
+ intf_ProgressUpdate( p_udt, i_progress, psz_status, f_progress, 0 );
free( psz_status );
}
+ free( psz_downloaded );
}
- free( p_this->psz_dest );
- free( p_this->psz_src );
- free( p_this->psz_status );
-
- vlc_object_destroy( p_this );
+ /* 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 )
+ {
+ intf_ProgressUpdate( p_udt, i_progress, psz_status, 100.0, 0 );
+ free( psz_status );
+ }
+ }
+ else
+ remove( psz_destfile );
+
+error:
+ if( p_stream )
+ stream_Delete( p_stream );
+ if( p_file )
+ fclose( p_file );
+ free( psz_destdir );
+ free( psz_destfile );
+ free( p_buffer );
+ free( psz_size );
}
+
+#endif
projects / vlc / blobdiff