/*****************************************************************************
- * update.c: VLC update and plugins download
+ * update.c: VLC update checking and downloading
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright © 2005-2008 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
/**
* \file
- * This file contains functions related to VLC and plugins update management
- */
-
-/*
- * TODO: * pgp verification of the update file
- * binary download, and pgp verification
+ * This file contains functions related to VLC update management
*/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_update.h>
#ifdef UPDATE_CHECK
-#include <ctype.h> /* tolower() */
#include <assert.h>
-
-#include <vlc_update.h>
-
-#include <vlc_block.h>
+#include <vlc_pgpkey.h>
#include <vlc_stream.h>
+#include <vlc_strings.h>
+#include <vlc_fs.h>
+#include <vlc_dialog.h>
#include <vlc_interface.h>
-#include <vlc_charset.h>
+
+#include <gcrypt.h>
+#include <vlc_gcrypt.h>
+#ifdef WIN32
+#include <shellapi.h>
+#endif
+#include "update.h"
+#include "../libvlc.h"
/*****************************************************************************
* Misc defines
*****************************************************************************/
+/*
+ * 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 of the binary for this last version
+ * Remaining text is a required description of the update
+ */
+
#if defined( UNDER_CE )
# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-ce"
#elif defined( WIN32 )
# 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_STATUS_URL "http://update.videolan.org/vlc/status-mac-ppc"
-# else
-# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-mac-x86"
-# endif
#elif defined( SYS_BEOS )
# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status-beos-x86"
#else
# define UPDATE_VLC_STATUS_URL "http://update.videolan.org/vlc/status"
#endif
-#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 extracmp( char *psz_1, char *psz_2 );
-static int CompareReleases( const struct update_release_t *p1,
- const struct update_release_t *p2 );
/*****************************************************************************
- * OpenPGP functions
+ * Update_t functions
*****************************************************************************/
-#define packet_type( c ) ( ( c & 0x3c ) >> 2 ) /* 0x3C = 00111100 */
-#define packet_header_len( c ) ( ( c & 0x03 ) + 1 ) /* number of bytes in a packet header */
-
-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();
-}
-
-/* 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
+#undef update_New
+/**
+ * Create a new update VLC struct
+ *
+ * \param p_this the calling vlc_object
+ * \return pointer to new update_t or NULL
*/
-static int parse_public_key_packet( public_key_packet_t *p_key, uint8_t *p_buf,
- size_t i_packet_len )
+update_t *update_New( vlc_object_t *p_this )
{
- if( i_packet_len != 418 )
- return VLC_EGENERIC;
-
- p_key->version = *p_buf++;
- if( p_key->version != 4 )
- return VLC_EGENERIC;
+ update_t *p_update;
+ assert( p_this );
- /* warn when timestamp is > date ? */
- memcpy( p_key->timestamp, p_buf, 4 ); p_buf += 4;
+ p_update = (update_t *)malloc( sizeof( update_t ) );
+ if( !p_update ) return NULL;
- p_key->algo = *p_buf++;
- if( p_key->algo != PUBLIC_KEY_ALGO_DSA )
- return VLC_EGENERIC;
+ vlc_mutex_init( &p_update->lock );
- 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_libvlc = p_this->p_libvlc;
- memcpy( p_key->q, p_buf, 2+20 ); p_buf += 2+20;
- if( mpi_len( p_key->q ) != 20 )
- return VLC_EGENERIC;
+ p_update->release.psz_url = NULL;
+ p_update->release.psz_desc = NULL;
- memcpy( p_key->g, p_buf, 2+128 ); p_buf += 2+128;
- if( mpi_len( p_key->g ) != 128 )
- return VLC_EGENERIC;
+ p_update->p_download = NULL;
+ p_update->p_check = NULL;
- memcpy( p_key->y, p_buf, 2+128 ); p_buf += 2+128;
- if( mpi_len( p_key->y ) != 128 )
- return VLC_EGENERIC;
+ p_update->p_pkey = NULL;
+ vlc_gcrypt_init();
- return VLC_SUCCESS;
+ return p_update;
}
-/*
- * fill a signature_packet_v4_t from signature packet data
- * verify that it was used with a DSA public key, using SHA-1 digest
+/**
+ * Delete an update_t struct
+ *
+ * \param p_update update_t* pointer
+ * \return nothing
*/
-static int parse_signature_v4_packet( signature_packet_v4_t *p_sig,
- uint8_t *p_buf, size_t i_sig_len )
+void update_Delete( update_t *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;
+ assert( p_update );
- 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 )
+ if( p_update->p_check )
{
- free( p_sig->hashed_data );
- return VLC_EGENERIC;
+ vlc_object_kill( p_update->p_check );
+ vlc_thread_join( p_update->p_check );
+ vlc_object_release( p_update->p_check );
}
- p_sig->unhashed_data = (uint8_t*) malloc( i_unhashed_data_len );
- if( !p_sig->unhashed_data )
+ if( p_update->p_download )
{
- free( p_sig->hashed_data );
- return VLC_ENOMEM;
+ vlc_object_kill( p_update->p_download );
+ vlc_thread_join( p_update->p_download );
+ vlc_object_release( p_update->p_download );
}
- 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;
- }
+ vlc_mutex_destroy( &p_update->lock );
- 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;
- }
+ free( p_update->release.psz_url );
+ free( p_update->release.psz_desc );
+ free( p_update->p_pkey );
- return VLC_SUCCESS;
+ free( p_update );
}
-/*
- * crc_octets() was lamely copied from rfc 2440
- * Copyright (C) The Internet Society (1998). All Rights Reserved.
+/**
+ * Empty the release struct
+ *
+ * \param p_update update_t* pointer
+ * \return nothing
*/
-#define CRC24_INIT 0xB704CEL
-#define CRC24_POLY 0x1864CFBL
-
-static long crc_octets( uint8_t *octets, size_t len )
+static void EmptyRelease( update_t *p_update )
{
- long crc = CRC24_INIT;
- int i;
- while (len--)
- {
- crc ^= (*octets++) << 16;
- for (i = 0; i < 8; i++)
- {
- crc <<= 1;
- if (crc & 0x1000000)
- crc ^= CRC24_POLY;
- }
- }
- return crc & 0xFFFFFFL;
+ 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 );
}
-/*
- * Transform an armored document in binary format
- * Used on public keys and signatures
+/**
+ * Get the update file and parse it
+ * p_update has to be locked when calling this function
+ *
+ * \param p_update pointer to update struct
+ * \return true if the update is valid and authenticated
*/
-static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len,
- uint8_t *p_obuf, size_t i_obuf_len )
+static bool GetUpdateFile( update_t *p_update )
{
- char *p_ipos = p_ibuf;
- uint8_t *p_opos = p_obuf;
- int i_end = 0;
-
- int i_header_skipped = 0;
+ stream_t *p_stream = NULL;
+ int i_major = 0;
+ int i_minor = 0;
+ int i_revision = 0;
+ unsigned char extra;
+ char *psz_version_line = NULL;
+ char *psz_update_data = NULL;
- while( !i_end && p_ipos < p_ibuf + i_ibuf_len )
+ p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL );
+ if( !p_stream )
{
- 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] == '=' )
- {
- i_end = 1;
- p_ipos[i_line_len - 1] = '\0';
- }
- else
- p_ipos[i_line_len] = '\0';
+ msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
+ }
- p_opos += vlc_b64_decode_binary_to_buffer( p_opos,
- p_obuf - p_opos + i_obuf_len,
- p_ipos );
+ const int64_t i_read = stream_Size( p_stream );
+ psz_update_data = malloc( i_read + 1 ); /* terminating '\0' */
+ if( !psz_update_data )
+ goto error;
- p_ipos += i_line_len + 1;
+ if( stream_Read( p_stream, psz_update_data, i_read ) != i_read )
+ {
+ msg_Err( p_update->p_libvlc, "Couldn't download update file %s",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
}
+ psz_update_data[i_read] = '\0';
- /* XXX: the CRC is OPTIONAL, really require it ? */
- if( p_ipos + 5 > p_ibuf + i_ibuf_len || *p_ipos++ != '=' )
- return 0;
+ stream_Delete( p_stream );
+ p_stream = NULL;
- uint8_t p_crc[3];
- if( vlc_b64_decode_binary_to_buffer( p_crc, 3, p_ipos ) != 3 )
- return 0;
+ /* first line : version number */
+ char *psz_update_data_parser = psz_update_data;
+ size_t i_len = strcspn( psz_update_data, "\r\n" );
+ psz_update_data_parser += i_len;
+ while( *psz_update_data_parser == '\r' || *psz_update_data_parser == '\n' )
+ psz_update_data_parser++;
- 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];
+ if( !(psz_version_line = malloc( i_len + 1)) )
+ goto error;
+ strncpy( psz_version_line, psz_update_data, i_len );
+ psz_version_line[i_len] = '\0';
- return l_crc2 == l_crc ? p_opos - p_obuf : 0;
-}
+ p_update->release.extra = 0;
+ switch( sscanf( psz_version_line, "%i.%i.%i%c",
+ &i_major, &i_minor, &i_revision, &extra ) )
+ {
+ 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" );
+ goto error;
+ }
-/*
- * 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
- */
-static int download_signature( vlc_object_t *p_this,
- signature_packet_v3_t *p_sig, char *psz_url )
-{
- char *psz_sig = (char*) malloc( strlen( psz_url ) + 4 + 1 ); /* ".asc" + \0 */
- if( !psz_sig )
- return VLC_ENOMEM;
+ /* second line : URL */
+ i_len = strcspn( psz_update_data_parser, "\r\n" );
+ if( i_len == 0 )
+ {
+ msg_Err( p_update->p_libvlc, "Update file %s is corrupted: URL missing",
+ UPDATE_VLC_STATUS_URL );
- strcpy( psz_sig, psz_url );
- strcat( psz_sig, ".asc" );
+ goto error;
+ }
- stream_t *p_stream = stream_UrlNew( p_this, psz_sig );
- free( psz_sig );
+ if( !(p_update->release.psz_url = malloc( i_len + 1)) )
+ goto error;
+ strncpy( p_update->release.psz_url, psz_update_data_parser, i_len );
+ p_update->release.psz_url[i_len] = '\0';
- if( !p_stream )
- return VLC_ENOMEM;
+ psz_update_data_parser += i_len;
+ while( *psz_update_data_parser == '\r' || *psz_update_data_parser == '\n' )
+ psz_update_data_parser++;
- 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 */
+ /* Remaining data : description */
+ i_len = strlen( psz_update_data_parser );
+ if( i_len == 0 )
{
- 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;
+ msg_Err( p_update->p_libvlc,
+ "Update file %s is corrupted: description missing",
+ UPDATE_VLC_STATUS_URL );
+ goto error;
}
- char *p_buf = (char*)malloc( i_size );
- if( !p_buf )
+ if( !(p_update->release.psz_desc = malloc( i_len + 1)) )
+ goto error;
+ strncpy( p_update->release.psz_desc, psz_update_data_parser, i_len );
+ p_update->release.psz_desc[i_len] = '\0';
+
+ /* Now that we know the status is valid, we must download its signature
+ * to authenticate it */
+ signature_packet_t sign;
+ if( download_signature( VLC_OBJECT( p_update->p_libvlc ), &sign,
+ UPDATE_VLC_STATUS_URL ) != VLC_SUCCESS )
{
- stream_Delete( p_stream );
- return VLC_ENOMEM;
+ msg_Err( p_update->p_libvlc, "Couldn't download signature of status file" );
+ goto error;
}
-
- int i_read = stream_Read( p_stream, p_buf, (int)i_size );
- stream_Delete( p_stream );
-
- if( i_read != i_size )
+ if( sign.type != BINARY_SIGNATURE && sign.type != TEXT_SIGNATURE )
{
- free( p_buf );
- return VLC_EGENERIC;
+ msg_Err( p_update->p_libvlc, "Invalid signature type" );
+ goto error;
}
-
- int i_bytes = pgp_unarmor( p_buf, i_size, (uint8_t*)p_sig, 65 );
- free( p_buf );
-
- if( i_bytes != 65 )
- return VLC_EGENERIC;
- else
- 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,
- 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;
-}
-
-/*
- * 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 );
+ p_update->p_pkey = (public_key_t*)malloc( sizeof( public_key_t ) );
+ if( !p_update->p_pkey )
+ goto error;
- while( p < max_pos )
+ if( parse_public_key( videolan_public_key, sizeof( videolan_public_key ),
+ p_update->p_pkey, NULL ) != VLC_SUCCESS )
{
- int i_subpacket_len = *p < 192 ? *p++ :
- *p < 255 ? ((*p++ - 192) << 8) + *p++ + 192 :
- ((*++p) << 24) + (*++p << 16) + (*++p << 8) + *++p;
-
- if( p >= max_pos - 1 )
- return NULL;
-
- if( *p == ISSUER_SUBPACKET )
- return p+1;
- else
- p += i_subpacket_len;
+ msg_Err( p_update->p_libvlc, "Couldn't parse embedded public key, something went really wrong..." );
+ FREENULL( p_update->p_pkey );
+ goto error;
}
- return NULL;
-}
-
-/*
- * 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
- */
-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 )
-{
- uint8_t *pos = (uint8_t*) p_key_data;
- uint8_t *max_pos = pos + i_key_len;
- int i_status = 0;
-#define PUBLIC_KEY_FOUND 0x01
-#define USER_ID_FOUND 0x02
-#define SIGNATURE_FOUND 0X04
+ memcpy( p_update->p_pkey->longid, videolan_public_key_longid, 8 );
- uint8_t *p_key_unarmored = NULL;
-
- signature_packet_v4_t sig;
-
- p_key->psz_username = NULL;
- p_key->sig.hashed_data = p_key->sig.unhashed_data = NULL;
-
- 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 );
-
- if( i_len == 0 )
- goto error;
-
- pos = p_key_unarmored;
- max_pos = pos + i_len;
- }
-
- while( pos < max_pos )
+ if( memcmp( sign.issuer_longid, p_update->p_pkey->longid , 8 ) != 0 )
{
- if( !(*pos & 0x80) || *pos & 0x40 )
- goto error;
-
- int i_type = packet_type( *pos );
-
- int i_header_len = packet_header_len( *pos++ );
- if( pos + i_header_len > max_pos )
+ 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;
+ }
- int i_packet_len = scalar_number( pos, i_header_len );
- pos += i_header_len;
-
- if( pos + i_packet_len > max_pos )
+ uint8_t *p_hash = hash_sha1_from_public_key( 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;
+ }
- switch( i_type )
+ if( verify_signature( p_new_pkey->sig.r, p_new_pkey->sig.s,
+ &p_update->p_pkey->key, p_hash ) == VLC_SUCCESS )
{
- 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;
-
- 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 )
- {
- memcpy( &p_key->sig, &sig, sizeof( signature_packet_v4_t ) );
- i_status |= SIGNATURE_FOUND;
- }
- else
- {
- free( sig.hashed_data );
- free( sig.unhashed_data );
- }
- break;
-
- 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;
-
- memcpy( p_key->psz_username, pos, i_packet_len );
- p_key->psz_username[i_packet_len] = '\0';
- break;
-
- default:
- break;
+ 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;
}
- pos += i_packet_len;
- }
- free( p_key_unarmored );
-
- if( !( i_status & ( PUBLIC_KEY_FOUND + USER_ID_FOUND ) ) )
- return VLC_EGENERIC;
-
- if( p_sig_issuer && !( i_status & SIGNATURE_FOUND ) )
- return VLC_EGENERIC;
-
- return VLC_SUCCESS;
-
-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;
-}
-
-/*
- * return a sha1 hash of a file
- */
-static uint8_t *hash_sha1_from_file( const char *psz_file,
- signature_packet_v3_t *p_sig )
-{
- FILE *f = utf8_fopen( psz_file, "r" );
- if( !f )
- return NULL;
-
- uint8_t buffer[4096]; //FIXME
-
- 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 )
- gcry_md_write( hd, buffer, i_read );
-
- gcry_md_putc( hd, p_sig->type );
- gcry_md_write( hd, &p_sig->timestamp, 4 );
-
- 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
- */
-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 )
- return NULL;
-
- stream_t *p_stream = stream_UrlNew( p_this, psz_url );
- free( psz_url );
- if( !p_stream )
- return NULL;
-
- int64_t i_size = stream_Size( p_stream );
- if( i_size < 0 )
- {
- stream_Delete( p_stream );
- return NULL;
}
- uint8_t *p_buf = (uint8_t*)malloc( i_size );
- if( !p_buf )
+ uint8_t *p_hash = hash_sha1_from_text( psz_update_data, &sign );
+ if( !p_hash )
{
- stream_Delete( p_stream );
- return NULL;
+ msg_Warn( p_update->p_libvlc, "Can't compute SHA1 hash for status file" );
+ goto error;
}
- int i_read = stream_Read( p_stream, p_buf, (int)i_size );
- stream_Delete( p_stream );
-
- if( i_read != (int)i_size )
+ else if( p_hash[0] != sign.hash_verification[0] ||
+ p_hash[1] != sign.hash_verification[1] )
{
- free( p_buf );
- return NULL;
+ msg_Warn( p_update->p_libvlc, "Bad SHA1 hash for status file" );
+ goto error;
}
- public_key_t *p_pkey = (public_key_t*) malloc( sizeof( public_key_t ) );
- if( !p_pkey )
+ else if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash )
+ != VLC_SUCCESS )
{
- free( p_buf );
- return NULL;
+ msg_Err( p_update->p_libvlc, "BAD SIGNATURE for status file" );
+ goto error;
}
- int i_error = parse_public_key( p_buf, i_read, p_pkey, p_signature_issuer );
- free( p_buf );
-
- if( i_error != VLC_SUCCESS )
+ else
{
- free( p_pkey );
- return NULL;
+ msg_Info( p_update->p_libvlc, "Status file authenticated" );
+ return true;
}
- return p_pkey;
+error:
+ if( p_stream )
+ stream_Delete( p_stream );
+ free( psz_version_line );
+ free( psz_update_data );
+ return false;
}
-/*
- * 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
+static void* update_CheckReal( vlc_object_t *p_this );
+
+/**
+ * Check for updates
+ *
+ * \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
*/
-static uint8_t *key_sign_hash( public_key_t *p_pkey )
+void update_Check( update_t *p_update, void (*pf_callback)( void*, bool ), void *p_data )
{
- gcry_error_t error = 0;
- gcry_md_hd_t hd;
-
- error = gcry_md_open( &hd, GCRY_MD_SHA1, 0 );
- if( error )
- return NULL;
-
- gcry_md_putc( hd, 0x99 );
-
- 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_putc( hd, 0xb4 );
-
- int i_len = strlen((char*)p_pkey->psz_username);
-
- 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 );
-
- gcry_md_write( hd, p_pkey->psz_username, i_len );
+ assert( p_update );
- size_t i_hashed_data_len = scalar_number( p_pkey->sig.hashed_data_len, 2 );
+ // If the object already exist, destroy it
+ if( p_update->p_check )
+ {
+ vlc_object_kill( p_update->p_check );
+ vlc_thread_join( p_update->p_check );
+ vlc_object_release( p_update->p_check );
+ }
- 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 );
+ update_check_thread_t *p_uct =
+ vlc_custom_create( p_update->p_libvlc, sizeof( *p_uct ),
+ VLC_OBJECT_GENERIC, "update check" );
+ if( !p_uct ) return;
- gcry_md_putc( hd, 0x04 );
- gcry_md_putc( hd, 0xff );
+ p_uct->p_update = p_update;
+ p_update->p_check = p_uct;
+ p_uct->pf_callback = pf_callback;
+ p_uct->p_data = p_data;
- i_hashed_data_len += 6; /* hashed data + 6 bytes header */
+ vlc_thread_create( p_uct, "check for update", update_CheckReal,
+ VLC_THREAD_PRIORITY_LOW );
+}
- 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 );
+void* update_CheckReal( vlc_object_t* p_this )
+{
+ update_check_thread_t *p_uct = (update_check_thread_t *)p_this;
+ bool b_ret;
+ int canc;
- gcry_md_final( hd );
+ canc = vlc_savecancel ();
+ vlc_mutex_lock( &p_uct->p_update->lock );
- uint8_t *p_hash = gcry_md_read( hd, GCRY_MD_SHA1);
+ EmptyRelease( p_uct->p_update );
+ b_ret = GetUpdateFile( p_uct->p_update );
+ vlc_mutex_unlock( &p_uct->p_update->lock );
- if( p_hash[0] != p_pkey->sig.hash_verification[0] ||
- p_hash[1] != p_pkey->sig.hash_verification[1] )
- {
- free( p_hash );
- return NULL;
- }
+ if( p_uct->pf_callback )
+ (p_uct->pf_callback)( p_uct->p_data, b_ret );
- return p_hash;
+ vlc_restorecancel (canc);
+ return NULL;
}
-
-/*****************************************************************************
- * Update_t functions
- *****************************************************************************/
-
/**
- * Create a new update VLC struct
+ * Compare a given release's version number to the current VLC's one
*
- * \param p_this the calling vlc_object
- * \return pointer to new update_t or NULL
+ * \param p_update structure
+ * \return true if we have to upgrade to the given version to be up to date
*/
-update_t *__update_New( vlc_object_t *p_this )
+static bool is_strictly_greater( int * a, int * b, int n)
{
- update_t *p_update;
-
- if( p_this == NULL ) return NULL;
-
- p_update = (update_t *)malloc( sizeof( update_t ) );
- if( !p_update ) return NULL;
-
- vlc_mutex_init( p_this, &p_update->lock );
-
- p_update->p_libvlc = p_this->p_libvlc;
+ if( n <= 0 ) return false;
+ if(a[0] > b[0] ) return true;
+ if(a[0] == b[0] ) return is_strictly_greater( a+1, b+1, n-1 );
+ /* a[0] < b[0] */ return false;
+}
- p_update->release.psz_svnrev = NULL;
- p_update->release.psz_extra = NULL;
- p_update->release.psz_url = NULL;
- p_update->release.psz_desc = NULL;
+bool update_NeedUpgrade( update_t *p_update )
+{
+ assert( p_update );
- return p_update;
+ int current_version[] = {
+ *PACKAGE_VERSION_MAJOR - '0',
+ *PACKAGE_VERSION_MINOR - '0',
+ *PACKAGE_VERSION_REVISION - '0',
+ /* extra string of development versions is "-git", "-rc" ..
+ * so make sure version a.b.c is newer than a.b.c-XXX */
+ (*PACKAGE_VERSION_EXTRA == '-') ? -1 : *PACKAGE_VERSION_EXTRA
+ };
+ int latest_version[] = {
+ p_update->release.i_major,
+ p_update->release.i_minor,
+ p_update->release.i_revision,
+ p_update->release.extra
+ };
+
+ return is_strictly_greater( latest_version, current_version, 4 );
}
/**
- * Delete an update_t struct
+ * Convert a long int size in bytes to a string
*
- * \param p_update update_t* pointer
- * \return nothing
+ * \param l_size the size in bytes
+ * \return the size as a string
*/
-void update_Delete( update_t *p_update )
+static char *size_str( long int l_size )
{
- assert( p_update );
-
- vlc_mutex_destroy( &p_update->lock );
-
- FREENULL( p_update->release.psz_svnrev );
- FREENULL( p_update->release.psz_extra );
- FREENULL( p_update->release.psz_url );
- FREENULL( p_update->release.psz_desc );
+ char *psz_tmp = NULL;
+ int i_retval = 0;
+ if( l_size >> 30 )
+ i_retval = asprintf( &psz_tmp, _("%.1f GiB"), (float)l_size/(1<<30) );
+ else if( l_size >> 20 )
+ i_retval = asprintf( &psz_tmp, _("%.1f MiB"), (float)l_size/(1<<20) );
+ else if( l_size >> 10 )
+ i_retval = asprintf( &psz_tmp, _("%.1f KiB"), (float)l_size/(1<<10) );
+ else
+ i_retval = asprintf( &psz_tmp, _("%ld B"), l_size );
- free( p_update );
+ return i_retval == -1 ? NULL : psz_tmp;
}
+static void* update_DownloadReal( vlc_object_t *p_this );
+
/**
- * Empty the release struct
+ * Download the file given in the update_t
*
- * \param p_update update_t* pointer
+ * \param p_update structure
+ * \param dir to store the download file
* \return nothing
*/
-static void EmptyRelease( update_t *p_update )
+void update_Download( update_t *p_update, const char *psz_destdir )
{
- p_update->release.i_major = 0;
- p_update->release.i_minor = 0;
- p_update->release.i_revision = 0;
+ assert( p_update );
- FREENULL( p_update->release.psz_svnrev );
- FREENULL( p_update->release.psz_extra );
- FREENULL( p_update->release.psz_url );
- FREENULL( p_update->release.psz_desc );
+ // If the object already exist, destroy it
+ if( p_update->p_download )
+ {
+ vlc_object_kill( p_update->p_download );
+ vlc_thread_join( p_update->p_download );
+ vlc_object_release( p_update->p_download );
+ }
+
+ update_download_thread_t *p_udt =
+ vlc_custom_create( p_update->p_libvlc, sizeof( *p_udt ),
+ VLC_OBJECT_GENERIC, "update download" );
+ if( !p_udt )
+ return;
+
+ p_udt->p_update = p_update;
+ p_update->p_download = p_udt;
+ p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
+
+ vlc_thread_create( p_udt, "download update", update_DownloadReal,
+ VLC_THREAD_PRIORITY_LOW );
}
-/**
- * Get the update file and parse it
- * *p_update has to be unlocked when calling this function
- *
- * \param p_update pointer to update struct
- * \return nothing
- */
-static void GetUpdateFile( update_t *p_update )
+static void* update_DownloadReal( vlc_object_t *p_this )
{
+ update_download_thread_t *p_udt = (update_download_thread_t *)p_this;
+ dialog_progress_bar_t *p_progress = NULL;
+ long int l_size;
+ long int l_downloaded = 0;
+ float f_progress;
+ char *psz_status;
+ char *psz_downloaded = NULL;
+ char *psz_size = NULL;
+ char *psz_destfile = NULL;
+ char *psz_tmpdestfile = NULL;
+
+ FILE *p_file = NULL;
stream_t *p_stream = NULL;
- int i_major = 0;
- int i_minor = 0;
- int i_revision = 0;
- char *psz_extra = NULL;
- char *psz_svnrev = NULL;
- char *psz_line = NULL;
+ void* p_buffer = NULL;
+ int i_read;
+ int canc;
- vlc_mutex_lock( &p_update->lock );
+ update_t *p_update = p_udt->p_update;
+ char *psz_destdir = p_udt->psz_destdir;
- p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL );
+ msg_Dbg( p_udt, "Opening Stream '%s'", p_update->release.psz_url );
+ canc = vlc_savecancel ();
+
+ /* Open the stream */
+ p_stream = stream_UrlNew( p_udt, p_update->release.psz_url );
if( !p_stream )
{
- msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
- UPDATE_VLC_STATUS_URL );
- goto error;
+ msg_Err( p_udt, "Failed to open %s for reading", p_update->release.psz_url );
+ goto end;
}
- /* Try to read three lines */
- if( !( psz_line = stream_ReadLine( p_stream ) ) )
+ /* Get the stream size */
+ l_size = stream_Size( p_stream );
+
+ /* Get the file name and open it*/
+ psz_tmpdestfile = strrchr( p_update->release.psz_url, '/' );
+ if( !psz_tmpdestfile )
{
- msg_Err( p_update->p_libvlc, "Update file %s is corrupted : missing version",
- UPDATE_VLC_STATUS_URL );
- goto error;
+ msg_Err( p_udt, "The URL %s is badly formated",
+ p_update->release.psz_url );
+ goto end;
}
+ psz_tmpdestfile++;
+ if( asprintf( &psz_destfile, "%s%s", psz_destdir, psz_tmpdestfile ) == -1 )
+ goto end;
- /* first line : version number */
- if( sscanf( psz_line, "%i.%i.%i%as %as", &i_major, &i_minor, &i_revision, &psz_extra, &psz_svnrev ) )
+ p_file = vlc_fopen( psz_destfile, "w" );
+ if( !p_file )
{
- p_update->release.i_major = i_major;
- p_update->release.i_minor = i_minor;
- p_update->release.i_revision = i_revision;
+ msg_Err( p_udt, "Failed to open %s for writing", psz_destfile );
+ dialog_FatalWait( p_udt, _("Saving file failed"),
+ _("Failed to open \"%s\" for writing"),
+ psz_destfile );
+ goto end;
+ }
- p_update->release.psz_svnrev = psz_svnrev ? psz_svnrev : STRDUP( "" );
- p_update->release.psz_extra = psz_extra ? psz_extra : STRDUP( "" );
+ /* Create a buffer and fill it with the downloaded file */
+ p_buffer = (void *)malloc( 1 << 10 );
+ if( !p_buffer )
+ {
+ msg_Err( p_udt, "Can't malloc (1 << 10) bytes! download cancelled." );
+ goto end;
}
- else
+
+ msg_Dbg( p_udt, "Downloading Stream '%s'", p_update->release.psz_url );
+
+ psz_size = size_str( l_size );
+ if( asprintf( &psz_status, _("%s\nDownloading... %s/%s %.1f%% done"),
+ p_update->release.psz_url, "0.0", psz_size, 0.0 ) != -1 )
{
- msg_Err( p_update->p_libvlc, "Update version false formated" );
- free( psz_line );
- goto error;
+ p_progress = dialog_ProgressCreate( p_udt, _( "Downloading ..."),
+ psz_status, _("Cancel") );
+ free( psz_status );
}
- /* Second line : URL */
- if( !( psz_line = stream_ReadLine( p_stream ) ) )
+ while( vlc_object_alive( p_udt ) &&
+ ( i_read = stream_Read( p_stream, p_buffer, 1 << 10 ) ) &&
+ !dialog_ProgressCancelled( p_progress ) )
{
- msg_Err( p_update->p_libvlc, "Update file %s is corrupted : URL missing",
- UPDATE_VLC_STATUS_URL );
- goto error;
+ 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 = (float)l_downloaded/(float)l_size;
+
+ if( asprintf( &psz_status, _( "%s\nDownloading... %s/%s - %.1f%% done" ),
+ p_update->release.psz_url, psz_downloaded, psz_size,
+ f_progress*100 ) != -1 )
+ {
+ dialog_ProgressSet( p_progress, psz_status, f_progress );
+ free( psz_status );
+ }
+ free( psz_downloaded );
}
- p_update->release.psz_url = psz_line;
+ /* Finish the progress bar or delete the file if the user had canceled */
+ fclose( p_file );
+ p_file = NULL;
- /* Third line : description */
- if( !( psz_line = stream_ReadLine( p_stream ) ) )
+ if( vlc_object_alive( p_udt ) &&
+ !dialog_ProgressCancelled( p_progress ) )
{
- msg_Err( p_update->p_libvlc, "Update file %s is corrupted : description missing",
- UPDATE_VLC_STATUS_URL );
- goto error;
+ dialog_ProgressDestroy( p_progress );
+ p_progress = NULL;
+ }
+ else
+ {
+ vlc_unlink( psz_destfile );
+ goto end;
}
- p_update->release.psz_desc = psz_line;
- error:
- vlc_mutex_unlock( &p_update->lock );
+ signature_packet_t sign;
+ if( download_signature( VLC_OBJECT( p_udt ), &sign,
+ p_update->release.psz_url ) != VLC_SUCCESS )
+ {
+ vlc_unlink( psz_destfile );
+
+ dialog_FatalWait( p_udt, _("File could not be verified"),
+ _("It was not possible to download a cryptographic signature for "
+ "the downloaded file \"%s\". Thus, it was deleted."),
+ psz_destfile );
+ msg_Err( p_udt, "Couldn't download signature of downloaded file" );
+ goto end;
+ }
- if( p_stream )
- stream_Delete( p_stream );
-}
+ if( memcmp( sign.issuer_longid, p_update->p_pkey->longid, 8 ) )
+ {
+ vlc_unlink( psz_destfile );
+ msg_Err( p_udt, "Invalid signature issuer" );
+ dialog_FatalWait( p_udt, _("Invalid signature"),
+ _("The cryptographic signature for the downloaded file \"%s\" was "
+ "invalid and could not be used to securely verify it. Thus, the "
+ "file was deleted."),
+ psz_destfile );
+ goto end;
+ }
-/**
- * Check for updates
- *
- * \param p_update pointer to update struct
- * \returns nothing
- */
-void update_Check( update_t *p_update )
-{
- assert( p_update );
+ if( sign.type != BINARY_SIGNATURE )
+ {
+ vlc_unlink( psz_destfile );
+ msg_Err( p_udt, "Invalid signature type" );
+ dialog_FatalWait( p_udt, _("Invalid signature"),
+ _("The cryptographic signature for the downloaded file \"%s\" was "
+ "invalid and could not be used to securely verify it. Thus, the "
+ "file was deleted."),
+ psz_destfile );
+ goto end;
+ }
- EmptyRelease( p_update );
+ uint8_t *p_hash = hash_sha1_from_file( psz_destfile, &sign );
+ if( !p_hash )
+ {
+ msg_Err( p_udt, "Unable to hash %s", psz_destfile );
+ vlc_unlink( psz_destfile );
+ dialog_FatalWait( p_udt, _("File not verifiable"),
+ _("It was not possible to securely verify the downloaded file"
+ " \"%s\". Thus, it was deleted."),
+ psz_destfile );
+
+ goto end;
+ }
- GetUpdateFile( p_update );
-}
+ if( p_hash[0] != sign.hash_verification[0] ||
+ p_hash[1] != sign.hash_verification[1] )
+ {
+ vlc_unlink( psz_destfile );
+ dialog_FatalWait( p_udt, _("File corrupted"),
+ _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."),
+ psz_destfile );
+ msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile );
+ free( p_hash );
+ goto end;
+ }
-/**
- * Compare two extra
- *
- * \param p1 first integer
- * \param p2 second integer
- * \return like strcmp
- */
-static int extracmp( char *psz_1, char *psz_2 )
-{
- if( psz_1[0] == '-' )
+ if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash )
+ != VLC_SUCCESS )
{
- if( psz_2[0] == '-' )
- return strcmp( psz_1, psz_2 );
- else
- return 1;
+ vlc_unlink( psz_destfile );
+ dialog_FatalWait( p_udt, _("File corrupted"),
+ _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."),
+ psz_destfile );
+ msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile );
+ free( p_hash );
+ goto end;
}
- else
+
+ msg_Info( p_udt, "%s authenticated", psz_destfile );
+ free( p_hash );
+
+#ifdef WIN32
+ int answer = dialog_Question( p_udt, _("Update VLC media player"),
+ _("The new version was successfully downloaded. Do you want to close VLC and install it now?"),
+ _("Install"), _("Cancel"), NULL);
+
+ if(answer == 1)
{
- if( psz_2[0] == '-' )
- return -1;
- else
- return strcmp( psz_1, psz_2 );
+ wchar_t psz_wdestfile[MAX_PATH];
+ MultiByteToWideChar( CP_UTF8, 0, psz_destfile, -1, psz_wdestfile, MAX_PATH );
+ answer = ShellExecuteW( NULL, L"open", psz_wdestfile, NULL, NULL, SW_SHOW);
+ if(answer > 32)
+ libvlc_Quit(p_this->p_libvlc);
}
+#endif
+end:
+ if( p_progress )
+ dialog_ProgressDestroy( p_progress );
+ 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 );
+
+ vlc_restorecancel( canc );
+ return NULL;
}
-/**
- * Compare two release numbers
- *
- * \param p1 first release
- * \param p2 second release
- * \return UpdateReleaseStatus(Older|Equal|Newer)
- */
-static int CompareReleases( const struct update_release_t *p1,
- const struct update_release_t *p2 )
+
+update_release_t *update_GetRelease( update_t *p_update )
{
- int32_t d;
- d = ( p1->i_major << 24 ) + ( p1->i_minor << 16 ) + ( p1->i_revision << 8 );
- d = d - ( p2->i_major << 24 ) - ( p2->i_minor << 16 ) - ( p2->i_revision << 8 );
- d += extracmp( p1->psz_extra, p2->psz_extra );
-
- if( d == 0 )
- d = strcmp( p1->psz_svnrev, p2->psz_svnrev );
-
- if( d < 0 )
- return UpdateReleaseStatusOlder;
- else if( d == 0 )
- return UpdateReleaseStatusEqual;
- else
- return UpdateReleaseStatusNewer;
+ return &p_update->release;
}
-/**
- * Compare a given release's version number to the current VLC's one
- *
- * \param p a release
- * \return UpdateReleaseStatus(Older|Equal|Newer)
- */
-int update_CompareReleaseToCurrent( update_t *p_update )
+#else
+#undef update_New
+update_t *update_New( vlc_object_t *p_this )
{
- assert( p_update );
+ (void)p_this;
+ return NULL;
+}
- struct update_release_t c;
- int i_major = 0;
- int i_minor = 0;
- int i_revision = 0;
- char *psz_extra;
- int i_result = UpdateReleaseStatusOlder;
+void update_Delete( update_t *p_update )
+{
+ (void)p_update;
+}
- /* get the current version number */
- if( sscanf( PACKAGE_VERSION, "%i.%i.%i%as", &i_major, &i_minor, &i_revision, &psz_extra ) )
- {
- c.i_major = i_major;
- c.i_minor = i_minor;
- c.i_revision = i_revision;
- if( psz_extra )
- c.psz_extra = psz_extra;
- else
- c.psz_extra = STRDUP( "" );
- c.psz_svnrev = STRDUP( VLC_Changeset() );
+void update_Check( update_t *p_update, void (*pf_callback)( void*, bool ),
+ void *p_data )
+{
+ (void)p_update; (void)pf_callback; (void)p_data;
+}
- i_result = CompareReleases( &p_update->release, &c );
+bool update_NeedUpgrade( update_t *p_update )
+{
+ (void)p_update;
+ return false;
+}
- free( c.psz_extra );
- free( c.psz_svnrev );
- }
- return i_result;
+void update_Download( update_t *p_update, const char *psz_destdir )
+{
+ (void)p_update; (void)psz_destdir;
}
+update_release_t *update_GetRelease( update_t *p_update )
+{
+ (void)p_update;
+ return NULL;
+}
#endif