X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fupdate.c;h=6d25a22aa128ac9273a0a95d4f1fa5b8a3be4e6e;hb=57c3ecd2292588c7312afbb6935d414bfbe2e826;hp=309501685e5fd02c9d081bb1a900555129ff8d0e;hpb=12c39680e3b87acf1e9c7f5019598e16b8f9d669;p=vlc diff --git a/src/misc/update.c b/src/misc/update.c index 309501685e..6d25a22aa1 100644 --- a/src/misc/update.c +++ b/src/misc/update.c @@ -1,7 +1,7 @@ /***************************************************************************** * update.c: VLC update checking and downloading ***************************************************************************** - * Copyright © 2005-2007 the VideoLAN team + * Copyright © 2005-2008 the VideoLAN team * $Id$ * * Authors: Antoine Cellerier @@ -25,25 +25,35 @@ /** * \file - * This file contains functions related to VLC and plugins update management + * This file contains functions related to VLC update management */ -/* TODO: pgp verification of the status file, and downloaded binaries */ - /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #ifdef UPDATE_CHECK #include -#include +#include #include +#include +#include #include +#include +#include + +#include "update.h" + /***************************************************************************** * Misc defines *****************************************************************************/ @@ -56,8 +66,8 @@ * * 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) + * 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 ) @@ -81,9 +91,7 @@ * 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 bool GetUpdateFile( update_t *p_update ); static char * size_str( long int l_size ); @@ -96,140 +104,316 @@ static char * size_str( long int l_size ); static inline int scalar_number( uint8_t *p, int header_len ) { + assert( header_len == 1 || header_len == 2 || header_len == 4 ); + 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(); + + abort(); /* to shut up GCC warning */ } /* number of data bytes in a MPI */ #define mpi_len( mpi ) ( ( scalar_number( mpi, 2 ) + 7 ) / 8 ) -/* +/* * fill a public_key_packet_t structure from public key packet data * verify that it is a version 4 public key packet, using DSA */ static int parse_public_key_packet( public_key_packet_t *p_key, uint8_t *p_buf, size_t i_packet_len ) { - if( i_packet_len != 418 ) + + if( i_packet_len > 418 || i_packet_len < 6 ) return VLC_EGENERIC; - p_key->version = *p_buf++; + size_t i_read = 0; + + p_key->version = *p_buf++; i_read++; if( p_key->version != 4 ) return VLC_EGENERIC; - /* warn when timestamp is > date ? */ - memcpy( p_key->timestamp, p_buf, 4 ); p_buf += 4; + /* XXX: warn when timestamp is > date ? */ + memcpy( p_key->timestamp, p_buf, 4 ); p_buf += 4; i_read += 4; - p_key->algo = *p_buf++; + p_key->algo = *p_buf++; i_read++; if( p_key->algo != PUBLIC_KEY_ALGO_DSA ) return VLC_EGENERIC; - memcpy( p_key->p, p_buf, 2+128 ); p_buf += 2+128; - if( mpi_len( p_key->p ) != 128 ) + /* read p */ + if( i_read + 2 > i_packet_len ) + return VLC_EGENERIC; + + int i_p_len = mpi_len( p_buf ); + + if( i_p_len > 128 || i_read + 2 + i_p_len > i_packet_len ) + return VLC_EGENERIC; + + memcpy( p_key->p, p_buf, 2+i_p_len ); + p_buf += 2+i_p_len; i_read += 2+i_p_len; + + /* read q */ + if( i_read + 2 > i_packet_len ) return VLC_EGENERIC; - memcpy( p_key->q, p_buf, 2+20 ); p_buf += 2+20; - if( mpi_len( p_key->q ) != 20 ) + int i_q_len = mpi_len( p_buf ); + + if( i_q_len > 20 || i_read+2+i_q_len > i_packet_len ) return VLC_EGENERIC; - memcpy( p_key->g, p_buf, 2+128 ); p_buf += 2+128; - if( mpi_len( p_key->g ) != 128 ) + memcpy( p_key->q, p_buf, 2+i_q_len ); + p_buf += 2+i_q_len; i_read += 2+i_q_len; + + /* read g */ + if( i_read + 2 > i_packet_len ) return VLC_EGENERIC; - memcpy( p_key->y, p_buf, 2+128 ); p_buf += 2+128; - if( mpi_len( p_key->y ) != 128 ) + int i_g_len = mpi_len( p_buf ); + + if( i_g_len > 128 || i_read+2+i_g_len > i_packet_len ) + return VLC_EGENERIC; + + memcpy( p_key->g, p_buf, 2+i_g_len ); + p_buf += 2+i_g_len; i_read += 2+i_g_len; + + /* read y */ + if( i_read + 2 > i_packet_len ) + return VLC_EGENERIC; + + int i_y_len = mpi_len( p_buf ); + + + if( i_y_len > 128 || i_read+2+i_y_len > i_packet_len ) + return VLC_EGENERIC; + + memcpy( p_key->y, p_buf, 2+i_y_len ); + i_read += 2+i_y_len; + + if( i_read != i_packet_len ) /* some extra data eh ? */ return VLC_EGENERIC; return VLC_SUCCESS; } +static size_t parse_signature_v3_packet( signature_packet_t *p_sig, + uint8_t *p_buf, size_t i_sig_len ) +{ + size_t i_read = 1; /* we already read the version byte */ + + if( i_sig_len < 19 ) /* signature is at least 19 bytes + the 2 MPIs */ + return 0; + + p_sig->specific.v3.hashed_data_len = *p_buf++; i_read++; + if( p_sig->specific.v3.hashed_data_len != 5 ) + return 0; + + p_sig->type = *p_buf++; i_read++; + + memcpy( p_sig->specific.v3.timestamp, p_buf, 4 ); + p_buf += 4; i_read += 4; + + memcpy( p_sig->issuer_longid, p_buf, 8 ); + p_buf += 8; i_read += 8; + + p_sig->public_key_algo = *p_buf++; i_read++; + + p_sig->digest_algo = *p_buf++; i_read++; + + p_sig->hash_verification[0] = *p_buf++; i_read++; + p_sig->hash_verification[1] = *p_buf++; i_read++; + + assert( i_read == 19 ); + + return i_read; +} + /* * fill a signature_packet_v4_t from signature packet data * verify that it was used with a DSA public key, using SHA-1 digest */ -static int parse_signature_v4_packet( signature_packet_v4_t *p_sig, +static size_t parse_signature_v4_packet( signature_packet_t *p_sig, uint8_t *p_buf, size_t i_sig_len ) { - if( i_sig_len < 54 ) - return VLC_EGENERIC; + size_t i_read = 1; /* we already read the version byte */ - p_sig->version = *p_buf++; - if( p_sig->version != 4 ) - return VLC_EGENERIC; + if( i_sig_len < 10 ) /* signature is at least 10 bytes + the 2 MPIs */ + return 0; - p_sig->type = *p_buf++; - if( p_sig->type < GENERIC_KEY_SIGNATURE || - p_sig->type > POSITIVE_KEY_SIGNATURE ) - return VLC_EGENERIC; + p_sig->type = *p_buf++; i_read++; - p_sig->public_key_algo = *p_buf++; - if( p_sig->public_key_algo != PUBLIC_KEY_ALGO_DSA ) - return VLC_EGENERIC; + p_sig->public_key_algo = *p_buf++; i_read++; - p_sig->digest_algo = *p_buf++; - if( p_sig->digest_algo != DIGEST_ALGO_SHA1 ) - return VLC_EGENERIC; + p_sig->digest_algo = *p_buf++; i_read++; - memcpy( p_sig->hashed_data_len, p_buf, 2 ); p_buf += 2; + memcpy( p_sig->specific.v4.hashed_data_len, p_buf, 2 ); + p_buf += 2; i_read += 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; + size_t i_hashed_data_len = + scalar_number( p_sig->specific.v4.hashed_data_len, 2 ); + i_read += i_hashed_data_len; + if( i_read + 4 > i_sig_len ) + return 0; - 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_sig->specific.v4.hashed_data = (uint8_t*) malloc( i_hashed_data_len ); + if( !p_sig->specific.v4.hashed_data ) + return 0; + memcpy( p_sig->specific.v4.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; + memcpy( p_sig->specific.v4.unhashed_data_len, p_buf, 2 ); + p_buf += 2; i_read += 2; + + size_t i_unhashed_data_len = + scalar_number( p_sig->specific.v4.unhashed_data_len, 2 ); + i_read += i_unhashed_data_len; + if( i_read + 2 > i_sig_len ) + return 0; + + p_sig->specific.v4.unhashed_data = (uint8_t*) malloc( i_unhashed_data_len ); + if( !p_sig->specific.v4.unhashed_data ) + return 0; - 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 ) + memcpy( p_sig->specific.v4.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; i_read += 2; + + uint8_t *p, *max_pos; + p = p_sig->specific.v4.unhashed_data; + max_pos = p + scalar_number( p_sig->specific.v4.unhashed_data_len, 2 ); + + for( ;; ) { - free( p_sig->hashed_data ); - return VLC_EGENERIC; + if( p > max_pos ) + return 0; + + size_t i_subpacket_len; + if( *p < 192 ) + { + if( p + 1 > max_pos ) + return 0; + i_subpacket_len = *p++; + } + else if( *p < 255 ) + { + if( p + 2 > max_pos ) + return 0; + i_subpacket_len = (*p++ - 192) << 8; + i_subpacket_len += *p++ + 192; + } + else + { + if( p + 4 > max_pos ) + return 0; + i_subpacket_len = *++p << 24; + i_subpacket_len += *++p << 16; + i_subpacket_len += *++p << 8; + i_subpacket_len += *++p; + } + + if( *p == ISSUER_SUBPACKET ) + { + if( p + 9 > max_pos ) + return 0; + + memcpy( &p_sig->issuer_longid, p+1, 8 ); + + return i_read; + } + + p += i_subpacket_len; } +} - p_sig->unhashed_data = (uint8_t*) malloc( i_unhashed_data_len ); - if( !p_sig->unhashed_data ) +static int parse_signature_packet( signature_packet_t *p_sig, + uint8_t *p_buf, size_t i_sig_len ) +{ + if( !i_sig_len ) /* 1st sanity check, we need at least the version */ + return VLC_EGENERIC; + + p_sig->version = *p_buf++; + + size_t i_read; + switch( p_sig->version ) { - free( p_sig->hashed_data ); - return VLC_ENOMEM; + case 3: + i_read = parse_signature_v3_packet( p_sig, p_buf, i_sig_len ); + break; + case 4: + p_sig->specific.v4.hashed_data = NULL; + p_sig->specific.v4.unhashed_data = NULL; + i_read = parse_signature_v4_packet( p_sig, p_buf, i_sig_len ); + break; + default: + return VLC_EGENERIC; } - 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; + if( i_read == 0 ) /* signature packet parsing has failed */ + goto error; + + if( p_sig->public_key_algo != PUBLIC_KEY_ALGO_DSA ) + goto error; - memcpy( p_sig->r, p_buf, 22 ); p_buf += 22; - if( mpi_len( p_sig->r ) != 20 ) + if( p_sig->digest_algo != DIGEST_ALGO_SHA1 ) + goto error; + + switch( p_sig->type ) { - free( p_sig->hashed_data ); - free( p_sig->unhashed_data ); - return VLC_EGENERIC; + case BINARY_SIGNATURE: + case TEXT_SIGNATURE: + case GENERIC_KEY_SIGNATURE: + case PERSONA_KEY_SIGNATURE: + case CASUAL_KEY_SIGNATURE: + case POSITIVE_KEY_SIGNATURE: + break; + default: + goto error; } - memcpy( p_sig->s, p_buf, 22 ); - if( mpi_len( p_sig->s ) != 20 ) + p_buf--; /* rewind to the version byte */ + p_buf += i_read; + + if( i_read + 2 > i_sig_len ) + goto error; + + size_t i_r_len = mpi_len( p_buf ); i_read += 2; + if( i_read + i_r_len > i_sig_len || i_r_len > 20 ) + goto error; + + memcpy( p_sig->r, p_buf, 2 + i_r_len ); + p_buf += 2 + i_r_len; + i_read += i_r_len; + + if( i_read + 2 > i_sig_len ) + goto error; + + size_t i_s_len = mpi_len( p_buf ); i_read += 2; + if( i_read + i_s_len > i_sig_len || i_s_len > 20 ) + goto error; + + memcpy( p_sig->s, p_buf, 2 + i_s_len ); + p_buf += 2 + i_s_len; + i_read += i_s_len; + + assert( i_read == i_sig_len ); + if( i_read < i_sig_len ) /* some extra data, hm ? */ + goto error; + + return VLC_SUCCESS; + +error: + + if( p_sig->version == 4 ) { - free( p_sig->hashed_data ); - free( p_sig->unhashed_data ); - return VLC_EGENERIC; + free( p_sig->specific.v4.hashed_data ); + free( p_sig->specific.v4.unhashed_data ); } - return VLC_SUCCESS; + return VLC_EGENERIC; } /* @@ -266,10 +450,9 @@ static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len, char *p_ipos = p_ibuf; uint8_t *p_opos = p_obuf; int i_end = 0; - int i_header_skipped = 0; - while( !i_end && p_ipos < p_ibuf + i_ibuf_len ) + while( !i_end && p_ipos < p_ibuf + i_ibuf_len && *p_ipos != '=' ) { if( *p_ipos == '\r' || *p_ipos == '\n' ) { @@ -289,7 +472,7 @@ static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len, p_ipos += i_line_len + 1; continue; } - + if( !strncmp( p_ipos, "Version:", 8 ) ) { p_ipos += i_line_len + 1; @@ -305,9 +488,7 @@ static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len, p_ipos[i_line_len] = '\0'; p_opos += vlc_b64_decode_binary_to_buffer( p_opos, - p_obuf - p_opos + i_obuf_len, - p_ipos ); - + p_obuf - p_opos + i_obuf_len, p_ipos ); p_ipos += i_line_len + 1; } @@ -327,10 +508,11 @@ static int pgp_unarmor( char *p_ibuf, size_t i_ibuf_len, /* * Download the signature associated to a document or a binary file. - * We're given the file's url, we just append ".asc" to it and download + * We're given the file's url, we just append ".asc" to it and download */ static int download_signature( vlc_object_t *p_this, - signature_packet_v3_t *p_sig, char *psz_url ) + signature_packet_t *p_sig, + const char *psz_url ) { char *psz_sig = (char*) malloc( strlen( psz_url ) + 4 + 1 ); /* ".asc" + \0 */ if( !psz_sig ) @@ -346,51 +528,102 @@ static int download_signature( vlc_object_t *p_this, return VLC_ENOMEM; int64_t i_size = stream_Size( p_stream ); - if( i_size < 65 ) + + msg_Dbg( p_this, "Downloading signature (%"PRId64" bytes)", i_size ); + uint8_t *p_buf = (uint8_t*)malloc( i_size ); + if( !p_buf ) { stream_Delete( p_stream ); + return VLC_ENOMEM; + } + + int i_read = stream_Read( p_stream, p_buf, (int)i_size ); + + stream_Delete( p_stream ); + + if( i_read != (int)i_size ) + { + msg_Dbg( p_this, + "Couldn't download full signature (only %d bytes)", i_read ); + free( p_buf ); return VLC_EGENERIC; } - else if( i_size == 65 ) /* binary format signature */ + + if( (uint8_t)*p_buf < 0x80 ) /* ASCII */ { - int i_read = stream_Read( p_stream, p_sig, (int)i_size ); - stream_Delete( p_stream ); - if( i_read != i_size ) + msg_Dbg( p_this, "Unarmoring signature" ); + + uint8_t* p_unarmored = (uint8_t*) malloc( ( i_size * 3 ) / 4 + 1 ); + if( !p_unarmored ) + { + free( p_buf ); return VLC_EGENERIC; - else - return VLC_SUCCESS; + } + + int i_bytes = pgp_unarmor( (char*)p_buf, i_size, p_unarmored, i_size ); + free( p_buf ); + + p_buf = p_unarmored; + i_size = i_bytes; + + if( i_bytes < 2 ) + { + free( p_buf ); + msg_Dbg( p_this, "Unarmoring failed : corrupted signature ?" ); + return VLC_EGENERIC; + } } - char *p_buf = (char*)malloc( i_size ); - if( !p_buf ) + if( packet_type( *p_buf ) != SIGNATURE_PACKET ) { - stream_Delete( p_stream ); - return VLC_ENOMEM; + free( p_buf ); + msg_Dbg( p_this, "Not a signature: %d", *p_buf ); + return VLC_EGENERIC; } - - int i_read = stream_Read( p_stream, p_buf, (int)i_size ); - stream_Delete( p_stream ); + size_t i_header_len = packet_header_len( *p_buf ); + if( ( i_header_len != 1 && i_header_len != 2 && i_header_len != 4 ) || + i_header_len + 1 > (size_t)i_size ) + { + free( p_buf ); + msg_Dbg( p_this, "Invalid signature packet header" ); + return VLC_EGENERIC; + } - if( i_read != i_size ) + size_t i_len = scalar_number( p_buf+1, i_header_len ); + if( i_len + i_header_len + 1 != (size_t)i_size ) { free( p_buf ); + msg_Dbg( p_this, "Invalid signature packet" ); return VLC_EGENERIC; } - - int i_bytes = pgp_unarmor( p_buf, i_size, (uint8_t*)p_sig, 65 ); + + int i_ret = parse_signature_packet( p_sig, p_buf+1+i_header_len, i_len ); free( p_buf ); + if( i_ret != VLC_SUCCESS ) + { + msg_Dbg( p_this, "Couldn't parse signature" ); + return i_ret; + } - if( i_bytes != 65 ) + if( p_sig->type != BINARY_SIGNATURE && p_sig->type != TEXT_SIGNATURE ) + { + msg_Dbg( p_this, "Invalid signature type: %d", p_sig->type ); + if( p_sig->version == 4 ) + { + free( p_sig->specific.v4.hashed_data ); + free( p_sig->specific.v4.unhashed_data ); + } return VLC_EGENERIC; - else - return VLC_SUCCESS; + } + + return VLC_SUCCESS; } /* * Verify an OpenPGP signature made on some SHA-1 hash, with some DSA public key */ -static int verify_signature( vlc_object_t *p_this, uint8_t *p_r, uint8_t *p_s, +static int verify_signature( uint8_t *p_r, uint8_t *p_s, public_key_packet_t *p_key, uint8_t *p_hash ) { /* the data to be verified (a SHA-1 hash) */ @@ -406,19 +639,26 @@ static int verify_signature( vlc_object_t *p_this, uint8_t *p_r, uint8_t *p_s, gcry_sexp_t key_sexp, hash_sexp, sig_sexp; key_sexp = hash_sexp = sig_sexp = NULL; - if( gcry_mpi_scan( &p, GCRYMPI_FMT_USG, p_key->p + 2, 128, NULL ) || - gcry_mpi_scan( &q, GCRYMPI_FMT_USG, p_key->q + 2, 20, NULL ) || - gcry_mpi_scan( &g, GCRYMPI_FMT_USG, p_key->g + 2, 128, NULL ) || - gcry_mpi_scan( &y, GCRYMPI_FMT_USG, p_key->y + 2, 128, NULL ) || + int i_p_len = mpi_len( p_key->p ); + int i_q_len = mpi_len( p_key->q ); + int i_g_len = mpi_len( p_key->g ); + int i_y_len = mpi_len( p_key->y ); + if( gcry_mpi_scan( &p, GCRYMPI_FMT_USG, p_key->p + 2, i_p_len, NULL ) || + gcry_mpi_scan( &q, GCRYMPI_FMT_USG, p_key->q + 2, i_q_len, NULL ) || + gcry_mpi_scan( &g, GCRYMPI_FMT_USG, p_key->g + 2, i_g_len, NULL ) || + gcry_mpi_scan( &y, GCRYMPI_FMT_USG, p_key->y + 2, i_y_len, NULL ) || gcry_sexp_build( &key_sexp, &erroff, key_sexp_s, p, q, g, y ) ) goto problem; - if( gcry_mpi_scan( &r, GCRYMPI_FMT_USG, p_r + 2, 20, NULL ) || - gcry_mpi_scan( &s, GCRYMPI_FMT_USG, p_s + 2, 20, NULL ) || + int i_r_len = mpi_len( p_r ); + int i_s_len = mpi_len( p_s ); + if( gcry_mpi_scan( &r, GCRYMPI_FMT_USG, p_r + 2, i_r_len, NULL ) || + gcry_mpi_scan( &s, GCRYMPI_FMT_USG, p_s + 2, i_s_len, NULL ) || gcry_sexp_build( &sig_sexp, &erroff, sig_sexp_s, r, s ) ) goto problem; - if( gcry_mpi_scan( &hash, GCRYMPI_FMT_USG, p_hash, 20, NULL ) || + int i_hash_len = 20; + if( gcry_mpi_scan( &hash, GCRYMPI_FMT_USG, p_hash, i_hash_len, NULL ) || gcry_sexp_build( &hash_sexp, &erroff, hash_sexp_s, hash ) ) goto problem; @@ -441,38 +681,14 @@ problem: 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 ); - - 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; - - if( p >= max_pos - 1 ) - return NULL; - - if( *p == ISSUER_SUBPACKET ) - return p+1; - else - p += i_subpacket_len; - } - 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 ) +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; @@ -484,10 +700,9 @@ static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public 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; + p_key->sig.specific.v4.hashed_data = NULL; + p_key->sig.specific.v4.unhashed_data = NULL; if( !( *pos & 0x80 ) ) { /* first byte is ASCII, unarmoring */ @@ -512,7 +727,8 @@ static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public int i_type = packet_type( *pos ); int i_header_len = packet_header_len( *pos++ ); - if( pos + i_header_len > max_pos ) + if( pos + i_header_len > max_pos || + ( i_header_len != 1 && i_header_len != 2 && i_header_len != 4 ) ) goto error; int i_packet_len = scalar_number( pos, i_header_len ); @@ -523,29 +739,31 @@ static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public switch( i_type ) { - 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 ) + case SIGNATURE_PACKET: /* we accept only v4 signatures here */ + if( i_status & SIGNATURE_FOUND || !p_sig_issuer ) break; - p_issuer = get_issuer_from_signature_v4( &sig ); - if( memcmp( p_issuer, p_sig_issuer, 8 ) == 0 ) + int i_ret = parse_signature_packet( &p_key->sig, pos, + i_packet_len ); + if( i_ret == VLC_SUCCESS ) { - memcpy( &p_key->sig, &sig, sizeof( signature_packet_v4_t ) ); + if( p_key->sig.version != 4 ) + break; + if( memcmp( p_key->sig.issuer_longid, p_sig_issuer, 8 ) ) + { + free( p_key->sig.specific.v4.hashed_data ); + free( p_key->sig.specific.v4.unhashed_data ); + p_key->sig.specific.v4.hashed_data = NULL; + p_key->sig.specific.v4.unhashed_data = NULL; + break; + } i_status |= SIGNATURE_FOUND; } - else - { - free( sig.hashed_data ); - free( sig.unhashed_data ); - } break; case USER_ID_PACKET: @@ -559,7 +777,7 @@ static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public memcpy( p_key->psz_username, pos, i_packet_len ); p_key->psz_username[i_packet_len] = '\0'; break; - + default: break; } @@ -567,7 +785,7 @@ static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public } free( p_key_unarmored ); - if( !( i_status & ( PUBLIC_KEY_FOUND + USER_ID_FOUND ) ) ) + if( !( i_status & ( PUBLIC_KEY_FOUND | USER_ID_FOUND ) ) ) return VLC_EGENERIC; if( p_sig_issuer && !( i_status & SIGNATURE_FOUND ) ) @@ -576,8 +794,11 @@ static int parse_public_key( const uint8_t *p_key_data, size_t i_key_len, public return VLC_SUCCESS; error: - free( p_key->sig.hashed_data ); - free( p_key->sig.unhashed_data ); + if( p_key->sig.version == 4 ) + { + free( p_key->sig.specific.v4.hashed_data ); + free( p_key->sig.specific.v4.unhashed_data ); + } free( p_key->psz_username ); free( p_key_unarmored ); return VLC_EGENERIC; @@ -587,45 +808,70 @@ error: * return a sha1 hash of a file */ static uint8_t *hash_sha1_from_file( const char *psz_file, - signature_packet_v3_t *p_sig ) + signature_packet_t *p_sig ) { + if( p_sig->type != BINARY_SIGNATURE && p_sig->type != TEXT_SIGNATURE ) + return NULL; + FILE *f = utf8_fopen( psz_file, "r" ); if( !f ) return NULL; - uint8_t buffer[4096]; //FIXME + uint8_t buffer[4096]; gcry_md_hd_t hd; if( gcry_md_open( &hd, GCRY_MD_SHA1, 0 ) ) { fclose( f ); return NULL; - } + } size_t i_read; while( ( i_read = fread( buffer, 1, sizeof(buffer), f ) ) > 0 ) gcry_md_write( hd, buffer, i_read ); - gcry_md_putc( hd, p_sig->type ); - gcry_md_write( hd, &p_sig->timestamp, 4 ); + if( p_sig->version == 3 ) + { + gcry_md_putc( hd, p_sig->type ); + gcry_md_write( hd, &p_sig->specific.v3.timestamp, 4 ); + } + else if( p_sig->version == 4 ) + { + gcry_md_putc( hd, p_sig->version ); + gcry_md_putc( hd, p_sig->type ); + gcry_md_putc( hd, p_sig->public_key_algo ); + gcry_md_putc( hd, p_sig->digest_algo ); + gcry_md_write( hd, p_sig->specific.v4.hashed_data_len, 2 ); + size_t i_len = scalar_number( p_sig->specific.v4.hashed_data_len, 2 ); + gcry_md_write( hd, p_sig->specific.v4.hashed_data, i_len ); + } + else + { /* RFC 4880 only tells about versions 3 and 4 */ + gcry_md_close( hd ); + return NULL; + } fclose( f ); gcry_md_final( hd ); - return( (uint8_t*) gcry_md_read( hd, GCRY_MD_SHA1) ); + uint8_t *p_tmp = (uint8_t*) gcry_md_read( hd, GCRY_MD_SHA1); + uint8_t *p_hash = malloc( 20 ); + if( p_hash ) + memcpy( p_hash, p_tmp, 20 ); + gcry_md_close( hd ); + return p_hash; } /* * 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 ) +static public_key_t *download_key( vlc_object_t *p_this, + const uint8_t *p_longid, const uint8_t *p_signature_issuer ) { char *psz_url; - if( asprintf( &psz_url, "http://download.videolan.org/pub/keys/%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x.asc", - p_longid[0], p_longid[1], - p_longid[2], p_longid[3], - p_longid[4], p_longid[5], - p_longid[6], p_longid[7] ) == -1 ) + if( asprintf( &psz_url, "http://download.videolan.org/pub/keys/%.2X%.2X%.2X%.2X%.2X%.2X%.2X%.2X.asc", + p_longid[0], p_longid[1], p_longid[2], p_longid[3], + p_longid[4], p_longid[5], p_longid[6], p_longid[7] ) == -1 ) return NULL; stream_t *p_stream = stream_UrlNew( p_this, psz_url ); @@ -652,6 +898,7 @@ static public_key_t *download_key( vlc_object_t *p_this, const uint8_t *p_longid if( i_read != (int)i_size ) { + msg_Dbg( p_this, "Couldn't read full GPG key" ); free( p_buf ); return NULL; } @@ -663,11 +910,14 @@ static public_key_t *download_key( vlc_object_t *p_this, const uint8_t *p_longid return NULL; } + memcpy( p_pkey->longid, p_longid, 8 ); + int i_error = parse_public_key( p_buf, i_read, p_pkey, p_signature_issuer ); free( p_buf ); if( i_error != VLC_SUCCESS ) { + msg_Dbg( p_this, "Couldn't parse GPG key" ); free( p_pkey ); return NULL; } @@ -676,11 +926,18 @@ static public_key_t *download_key( vlc_object_t *p_this, const uint8_t *p_longid } /* - * 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 + * Generate a SHA1 hash on a public key, to verify a signature made on that hash + * Note that we need the signature (v4) to compute the hash */ static uint8_t *key_sign_hash( public_key_t *p_pkey ) { + if( p_pkey->sig.version != 4 ) + return NULL; + + if( p_pkey->sig.type < GENERIC_KEY_SIGNATURE || + p_pkey->sig.type > POSITIVE_KEY_SIGNATURE ) + return NULL; + gcry_error_t error = 0; gcry_md_hd_t hd; @@ -690,14 +947,35 @@ static uint8_t *key_sign_hash( public_key_t *p_pkey ) gcry_md_putc( hd, 0x99 ); - gcry_md_putc( hd, (418 >> 8) & 0xff ); - gcry_md_putc( hd, 418 & 0xff ); + size_t i_p_len = mpi_len( p_pkey->key.p ); + size_t i_g_len = mpi_len( p_pkey->key.g ); + size_t i_q_len = mpi_len( p_pkey->key.q ); + size_t i_y_len = mpi_len( p_pkey->key.y ); + + size_t i_size = 6 + 2*4 + i_p_len + i_g_len + i_q_len + i_y_len; + + gcry_md_putc( hd, (i_size >> 8) & 0xff ); + gcry_md_putc( hd, i_size & 0xff ); + + gcry_md_putc( hd, p_pkey->key.version ); + gcry_md_write( hd, p_pkey->key.timestamp, 4 ); + gcry_md_putc( hd, p_pkey->key.algo ); + + gcry_md_write( hd, (uint8_t*)&p_pkey->key.p, 2 ); + gcry_md_write( hd, (uint8_t*)&p_pkey->key.p + 2, i_p_len ); - gcry_md_write( hd, (uint8_t*)&p_pkey->key, 418 ); + gcry_md_write( hd, (uint8_t*)&p_pkey->key.q, 2 ); + gcry_md_write( hd, (uint8_t*)&p_pkey->key.q + 2, i_q_len ); + + gcry_md_write( hd, (uint8_t*)&p_pkey->key.g, 2 ); + gcry_md_write( hd, (uint8_t*)&p_pkey->key.g + 2, i_g_len ); + + gcry_md_write( hd, (uint8_t*)&p_pkey->key.y, 2 ); + gcry_md_write( hd, (uint8_t*)&p_pkey->key.y + 2, i_y_len ); gcry_md_putc( hd, 0xb4 ); - int i_len = strlen((char*)p_pkey->psz_username); + size_t i_len = strlen((char*)p_pkey->psz_username); gcry_md_putc( hd, (i_len << 24) & 0xff ); gcry_md_putc( hd, (i_len << 16) & 0xff ); @@ -706,14 +984,15 @@ static uint8_t *key_sign_hash( public_key_t *p_pkey ) gcry_md_write( hd, p_pkey->psz_username, i_len ); - size_t i_hashed_data_len = scalar_number( p_pkey->sig.hashed_data_len, 2 ); + size_t i_hashed_data_len = + scalar_number( p_pkey->sig.specific.v4.hashed_data_len, 2 ); 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 ); + gcry_md_write( hd, p_pkey->sig.specific.v4.hashed_data_len, 2 ); + gcry_md_write( hd, p_pkey->sig.specific.v4.hashed_data, i_hashed_data_len ); gcry_md_putc( hd, 0x04 ); gcry_md_putc( hd, 0xff ); @@ -727,15 +1006,20 @@ static uint8_t *key_sign_hash( public_key_t *p_pkey ) gcry_md_final( hd ); - uint8_t *p_hash = gcry_md_read( hd, GCRY_MD_SHA1); + uint8_t *p_tmp = gcry_md_read( hd, GCRY_MD_SHA1); - if( p_hash[0] != p_pkey->sig.hash_verification[0] || - p_hash[1] != p_pkey->sig.hash_verification[1] ) + if( !p_tmp || + p_tmp[0] != p_pkey->sig.hash_verification[0] || + p_tmp[1] != p_pkey->sig.hash_verification[1] ) { - free( p_hash ); + gcry_md_close( hd ); return NULL; } + uint8_t *p_hash = malloc( 20 ); + if( p_hash ) + memcpy( p_hash, p_tmp, 20 ); + gcry_md_close( hd ); return p_hash; } @@ -758,13 +1042,16 @@ update_t *__update_New( vlc_object_t *p_this ) p_update = (update_t *)malloc( sizeof( update_t ) ); if( !p_update ) return NULL; - vlc_mutex_init( p_this, &p_update->lock ); + vlc_mutex_init( &p_update->lock ); p_update->p_libvlc = p_this->p_libvlc; p_update->release.psz_url = NULL; p_update->release.psz_desc = NULL; + p_update->p_pkey = NULL; + vlc_gcrypt_init(); + return p_update; } @@ -780,8 +1067,9 @@ void update_Delete( update_t *p_update ) vlc_mutex_destroy( &p_update->lock ); - FREENULL( p_update->release.psz_url ); - FREENULL( p_update->release.psz_desc ); + free( p_update->release.psz_url ); + free( p_update->release.psz_desc ); + free( p_update->p_pkey ); free( p_update ); } @@ -804,19 +1092,19 @@ static void EmptyRelease( update_t *p_update ) /** * Get the update file and parse it - * *p_update has to be locked when calling this function + * p_update has to be locked when calling this function * * \param p_update pointer to update struct - * \return nothing + * \return true if the update is valid and authenticated */ -static void GetUpdateFile( update_t *p_update ) +static bool GetUpdateFile( update_t *p_update ) { stream_t *p_stream = NULL; int i_major = 0; int i_minor = 0; int i_revision = 0; unsigned char extra; - char *psz_line = NULL; + char *psz_version_line = NULL; p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL ); if( !p_stream ) @@ -826,8 +1114,8 @@ static void GetUpdateFile( update_t *p_update ) goto error; } - /* Try to read three lines */ - if( !( psz_line = stream_ReadLine( p_stream ) ) ) + /* Start reading the status file */ + if( !( psz_version_line = stream_ReadLine( p_stream ) ) ) { msg_Err( p_update->p_libvlc, "Update file %s is corrupted : missing version", UPDATE_VLC_STATUS_URL ); @@ -836,7 +1124,8 @@ static void GetUpdateFile( update_t *p_update ) /* first line : version number */ p_update->release.extra = 0; - switch( sscanf( psz_line, "%i.%i.%i%c", &i_major, &i_minor, &i_revision, &extra ) ) + switch( sscanf( psz_version_line, "%i.%i.%i%c", + &i_major, &i_minor, &i_revision, &extra ) ) { case 4: p_update->release.extra = extra; @@ -847,32 +1136,204 @@ static void GetUpdateFile( update_t *p_update ) break; default: msg_Err( p_update->p_libvlc, "Update version false formated" ); - free( psz_line ); goto error; } - /* Second line : URL */ - if( !( psz_line = stream_ReadLine( p_stream ) ) ) + /* second line : URL */ + if( !( p_update->release.psz_url = stream_ReadLine( p_stream ) ) ) { msg_Err( p_update->p_libvlc, "Update file %s is corrupted : URL missing", UPDATE_VLC_STATUS_URL ); goto error; } - p_update->release.psz_url = psz_line; + /* Remaining data : description */ + int i_read = stream_Size( p_stream ) - stream_Tell( p_stream ); + if( i_read <= 0 ) + { + msg_Err( p_update->p_libvlc, + "Update file %s is corrupted: description missing", + UPDATE_VLC_STATUS_URL ); + goto error; + } - /* Third line : description */ - if( !( psz_line = stream_ReadLine( p_stream ) ) ) + p_update->release.psz_desc = (char*) malloc( i_read + 1 ); + if( !p_update->release.psz_desc ) + goto error; + + if( stream_Read( p_stream, p_update->release.psz_desc, i_read ) != i_read ) { - msg_Err( p_update->p_libvlc, "Update file %s is corrupted : description missing", - UPDATE_VLC_STATUS_URL ); + msg_Err( p_update->p_libvlc, "Couldn't download update file %s", + UPDATE_VLC_STATUS_URL ); + goto error; + } + p_update->release.psz_desc[i_read] = '\0'; + + stream_Delete( p_stream ); + p_stream = NULL; + + /* Now that we know the status is valid, we must download its signature + * to authenticate it */ + signature_packet_t sign; + if( download_signature( VLC_OBJECT( p_update->p_libvlc ), &sign, + UPDATE_VLC_STATUS_URL ) != VLC_SUCCESS ) + { + msg_Err( p_update->p_libvlc, "Couldn't download signature of status file" ); + goto error; + } + + if( sign.type != BINARY_SIGNATURE && sign.type != TEXT_SIGNATURE ) + { + msg_Err( p_update->p_libvlc, "Invalid signature type" ); goto error; } - p_update->release.psz_desc = psz_line; + p_update->p_pkey = (public_key_t*)malloc( sizeof( public_key_t ) ); + if( !p_update->p_pkey ) + goto error; + + if( parse_public_key( videolan_public_key, sizeof( videolan_public_key ), + p_update->p_pkey, NULL ) != VLC_SUCCESS ) + { + msg_Err( p_update->p_libvlc, "Couldn't parse embedded public key, something went really wrong..." ); + FREENULL( p_update->p_pkey ); + goto error; + } + + memcpy( p_update->p_pkey->longid, videolan_public_key_longid, 8 ); + + if( memcmp( sign.issuer_longid, p_update->p_pkey->longid , 8 ) != 0 ) + { + msg_Dbg( p_update->p_libvlc, "Need to download the GPG key" ); + public_key_t *p_new_pkey = download_key( + VLC_OBJECT(p_update->p_libvlc), + sign.issuer_longid, videolan_public_key_longid ); + if( !p_new_pkey ) + { + msg_Err( p_update->p_libvlc, "Couldn't download GPG key" ); + FREENULL( p_update->p_pkey ); + goto error; + } + + uint8_t *p_hash = key_sign_hash( p_new_pkey ); + if( !p_hash ) + { + msg_Err( p_update->p_libvlc, "Failed to hash signature" ); + free( p_new_pkey ); + FREENULL( p_update->p_pkey ); + goto error; + } + + if( verify_signature( p_new_pkey->sig.r, p_new_pkey->sig.s, + &p_update->p_pkey->key, p_hash ) == VLC_SUCCESS ) + { + free( p_hash ); + msg_Info( p_update->p_libvlc, "Key authenticated" ); + free( p_update->p_pkey ); + p_update->p_pkey = p_new_pkey; + } + else + { + free( p_hash ); + msg_Err( p_update->p_libvlc, "Key signature invalid !\n" ); + goto error; + } + } + + gcry_md_hd_t hd; + if( gcry_md_open( &hd, GCRY_MD_SHA1, 0 ) ) + goto error_hd; + + gcry_md_write( hd, psz_version_line, strlen( psz_version_line ) ); + FREENULL( psz_version_line ); + if( sign.type == TEXT_SIGNATURE ) + gcry_md_putc( hd, '\r' ); + gcry_md_putc( hd, '\n' ); + gcry_md_write( hd, p_update->release.psz_url, + strlen( p_update->release.psz_url ) ); + if( sign.type == TEXT_SIGNATURE ) + gcry_md_putc( hd, '\r' ); + gcry_md_putc( hd, '\n' ); + + char *psz_desc = p_update->release.psz_desc; + while( *psz_desc ) + { + size_t i_len = strcspn( psz_desc, "\r\n" ); + if( !i_len ) + break; + + gcry_md_write( hd, psz_desc, i_len ); + if( sign.type == TEXT_SIGNATURE ) + gcry_md_putc( hd, '\r' ); + gcry_md_putc( hd, '\n' ); + + psz_desc += i_len; + while( *psz_desc == '\r' || *psz_desc == '\n' ) + psz_desc++; + } + + if( sign.version == 3 ) + { + gcry_md_putc( hd, sign.type ); + gcry_md_write( hd, &sign.specific.v3.timestamp, 4 ); + } + else if( sign.version == 4 ) + { + gcry_md_putc( hd, sign.version ); + gcry_md_putc( hd, sign.type ); + gcry_md_putc( hd, sign.public_key_algo ); + gcry_md_putc( hd, sign.digest_algo ); + gcry_md_write( hd, sign.specific.v4.hashed_data_len, 2 ); + size_t i_len = scalar_number( sign.specific.v4.hashed_data_len, 2 ); + gcry_md_write( hd, sign.specific.v4.hashed_data, i_len ); + gcry_md_putc( hd, 0x04 ); + gcry_md_putc( hd, 0xFF ); + + i_len += 6; /* hashed data + 6 bytes header */ + + 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 ); + } + else + { /* RFC 4880 only tells about versions 3 and 4 */ + msg_Warn( p_update->p_libvlc, "Invalid signature version %d", + sign.version); + goto error_hd; + } + + gcry_md_final( hd ); + + uint8_t *p_hash = gcry_md_read( hd, GCRY_MD_SHA1 ); + + if( p_hash[0] != sign.hash_verification[0] || + p_hash[1] != sign.hash_verification[1] ) + { + msg_Warn( p_update->p_libvlc, "Bad SHA1 hash for status file" ); + goto error_hd; + } + + if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash ) + != VLC_SUCCESS ) + { + msg_Err( p_update->p_libvlc, "BAD SIGNATURE for status file" ); + goto error_hd; + } + else + { + msg_Info( p_update->p_libvlc, "Status file authenticated" ); + gcry_md_close( hd ); + return true; + } + +error_hd: + gcry_md_close( hd ); error: if( p_stream ) stream_Delete( p_stream ); + free( psz_version_line ); + return false; } @@ -883,6 +1344,8 @@ typedef struct { VLC_COMMON_MEMBERS update_t *p_update; + void (*pf_callback)( void *, bool ); + void *p_data; } update_check_thread_t; void update_CheckReal( update_check_thread_t *p_uct ); @@ -891,74 +1354,53 @@ void update_CheckReal( update_check_thread_t *p_uct ); * 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 */ -void update_Check( update_t *p_update ) +void update_Check( update_t *p_update, void (*pf_callback)( void*, bool ), void *p_data ) { assert( p_update ); update_check_thread_t *p_uct = vlc_object_create( p_update->p_libvlc, sizeof( update_check_thread_t ) ); + if( !p_uct ) return; + 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 ); + VLC_THREAD_PRIORITY_LOW, false ); } void update_CheckReal( update_check_thread_t *p_uct ) { + bool b_ret; vlc_mutex_lock( &p_uct->p_update->lock ); EmptyRelease( p_uct->p_update ); - GetUpdateFile( p_uct->p_update ); - + b_ret = GetUpdateFile( p_uct->p_update ); vlc_mutex_unlock( &p_uct->p_update->lock ); - var_TriggerCallback( p_uct->p_libvlc, "update-notify" ); -} - -/** - * 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 ) -{ - 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 ); - - if( d < 0 ) - return UpdateReleaseStatusOlder; - else if( d == 0 ) - return UpdateReleaseStatusEqual; - else - return UpdateReleaseStatusNewer; + if( p_uct->pf_callback ) + (p_uct->pf_callback)( p_uct->p_data, b_ret ); } /** * Compare a given release's version number to the current VLC's one * * \param p_update structure - * \return UpdateReleaseStatus(Older|Equal|Newer) + * \return true if we have to upgrade to the given version to be up to date */ -int update_CompareReleaseToCurrent( update_t *p_update ) +bool update_NeedUpgrade( update_t *p_update ) { assert( p_update ); - struct update_release_t c; - - /* 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 ); + return p_update->release.i_major < *PACKAGE_VERSION_MAJOR - '0' || + p_update->release.i_minor < *PACKAGE_VERSION_MINOR - '0' || + p_update->release.i_revision < *PACKAGE_VERSION_REVISION - '0' || + p_update->release.extra < *PACKAGE_VERSION_EXTRA; } /** @@ -970,19 +1412,21 @@ int update_CompareReleaseToCurrent( update_t *p_update ) static char *size_str( long int l_size ) { char *psz_tmp = NULL; + int i_retval = 0; if( l_size >> 30 ) - asprintf( &psz_tmp, "%.1f GB", (float)l_size/(1<<30) ); + i_retval = asprintf( &psz_tmp, "%.1f GB", (float)l_size/(1<<30) ); else if( l_size >> 20 ) - asprintf( &psz_tmp, "%.1f MB", (float)l_size/(1<<20) ); + i_retval = asprintf( &psz_tmp, "%.1f MB", (float)l_size/(1<<20) ); else if( l_size >> 10 ) - asprintf( &psz_tmp, "%.1f kB", (float)l_size/(1<<10) ); + i_retval = asprintf( &psz_tmp, "%.1f kB", (float)l_size/(1<<10) ); else - asprintf( &psz_tmp, "%ld B", l_size ); - return psz_tmp; + i_retval = asprintf( &psz_tmp, "%ld B", l_size ); + + return i_retval == -1 ? NULL : psz_tmp; } -/* +/** * Struct to launch the download in a thread */ typedef struct @@ -1001,19 +1445,22 @@ void update_DownloadReal( update_download_thread_t *p_udt ); * \param dir to store the download file * \return nothing */ -void update_Download( update_t *p_update, char *psz_destdir ) +void update_Download( update_t *p_update, const char *psz_destdir ) { assert( p_update ); update_download_thread_t *p_udt = vlc_object_create( p_update->p_libvlc, - sizeof( update_download_thread_t ) ); + sizeof( update_download_thread_t ) ); + if( !p_udt ) + return; p_udt->p_update = p_update; p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL; vlc_thread_create( p_udt, "download update", update_DownloadReal, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + VLC_THREAD_PRIORITY_LOW, false ); } + void update_DownloadReal( update_download_thread_t *p_udt ) { int i_progress = 0; @@ -1035,11 +1482,11 @@ void update_DownloadReal( update_download_thread_t *p_udt ) char *psz_destdir = p_udt->psz_destdir; /* Open the stream */ - p_stream = stream_UrlNew( p_update->p_libvlc, p_update->release.psz_url ); + p_stream = stream_UrlNew( p_udt, p_update->release.psz_url ); if( !p_stream ) { msg_Err( p_udt, "Failed to open %s for reading", p_update->release.psz_url ); - goto error; + goto end; } /* Get the stream size */ @@ -1050,26 +1497,27 @@ void update_DownloadReal( update_download_thread_t *p_udt ) if( !psz_tmpdestfile ) { msg_Err( p_udt, "The URL %s is false formated", p_update->release.psz_url ); - goto error; + goto end; } psz_tmpdestfile++; if( asprintf( &psz_destfile, "%s%s", psz_destdir, psz_tmpdestfile ) == -1 ) - goto error; + goto end; p_file = utf8_fopen( psz_destfile, "w" ); if( !p_file ) { msg_Err( p_udt, "Failed to open %s for writing", psz_destfile ); - goto error; + goto end; } /* Create a buffer and fill it with the downloaded file */ p_buffer = (void *)malloc( 1 << 10 ); if( !p_buffer ) - goto error; + goto end; psz_size = size_str( l_size ); - if( asprintf( &psz_status, "%s\nDownloading... O.O/%s %.1f%% done", p_update->release.psz_url, psz_size, 0.0 ) != -1 ) + if( asprintf( &psz_status, "%s\nDownloading... O.O/%s %.1f%% done", + p_update->release.psz_url, psz_size, 0.0 ) != -1 ) { i_progress = intf_UserProgress( p_udt, "Downloading ...", psz_status, 0.0, 0 ); free( psz_status ); @@ -1078,14 +1526,19 @@ void update_DownloadReal( update_download_thread_t *p_udt ) while( ( i_read = stream_Read( p_stream, p_buffer, 1 << 10 ) ) && !intf_ProgressIsCancelled( p_udt, i_progress ) ) { - fwrite( p_buffer, i_read, 1, p_file ); + if( fwrite( p_buffer, i_read, 1, p_file ) < 1 ) + { + msg_Err( p_udt, "Failed to write into %s", psz_destfile ); + break; + } l_downloaded += i_read; psz_downloaded = size_str( l_downloaded ); f_progress = 100.0*(float)l_downloaded/(float)l_size; - if( asprintf( &psz_status, "%s\nDonwloading... %s/%s %.1f%% done", p_update->release.psz_url, - psz_size, psz_downloaded, f_progress ) != -1 ) + if( asprintf( &psz_status, "%s\nDonwloading... %s/%s %.1f%% done", + p_update->release.psz_url, psz_downloaded, psz_size, + f_progress ) != -1 ) { intf_ProgressUpdate( p_udt, i_progress, psz_status, f_progress, 0 ); free( psz_status ); @@ -1096,26 +1549,148 @@ void update_DownloadReal( update_download_thread_t *p_udt ) /* Finish the progress bar or delete the file if the user had canceled */ fclose( p_file ); p_file = NULL; + if( !intf_ProgressIsCancelled( p_udt, i_progress ) ) { - if( asprintf( &psz_status, "%s\nDone %s (100.0%%)", p_update->release.psz_url, psz_size ) != -1 ) + if( asprintf( &psz_status, "%s\nDone %s (100.0%%)", + p_update->release.psz_url, psz_size ) != -1 ) { intf_ProgressUpdate( p_udt, i_progress, psz_status, 100.0, 0 ); free( psz_status ); } } else - remove( psz_destfile ); - - 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 ); + { + utf8_unlink( psz_destfile ); + goto end; + } + + signature_packet_t sign; + if( download_signature( VLC_OBJECT( p_udt ), &sign, + p_update->release.psz_url ) != VLC_SUCCESS ) + { + utf8_unlink( psz_destfile ); + + intf_UserFatal( p_udt, true, _("File can not be verified"), + _("It was not possible to download a cryptographic signature for " + "downloaded file \"%s\", and so VLC deleted it."), + psz_destfile ); + msg_Err( p_udt, "Couldn't download signature of downloaded file" ); + goto end; + } + + if( memcmp( sign.issuer_longid, p_update->p_pkey->longid, 8 ) ) + { + utf8_unlink( psz_destfile ); + msg_Err( p_udt, "Invalid signature issuer" ); + intf_UserFatal( p_udt, true, _("Invalid signature"), + _("The cryptographic signature for downloaded file \"%s\" was " + "invalid and couldn't be used to securely verify it, and so " + "VLC deleted it."), + psz_destfile ); + goto end; + } + + if( sign.type != BINARY_SIGNATURE ) + { + utf8_unlink( psz_destfile ); + msg_Err( p_udt, "Invalid signature type" ); + intf_UserFatal( p_udt, true, _("Invalid signature"), + _("The cryptographic signature for downloaded file \"%s\" was " + "invalid and couldn't be used to securely verify it, and so " + "VLC deleted it."), + psz_destfile ); + goto end; + } + + uint8_t *p_hash = hash_sha1_from_file( psz_destfile, &sign ); + if( !p_hash ) + { + msg_Err( p_udt, "Unable to hash %s", psz_destfile ); + utf8_unlink( psz_destfile ); + intf_UserFatal( p_udt, true, _("File not verifiable"), + _("It was not possible to securely verify downloaded file \"%s\", " + "and so VLC deleted it."), + psz_destfile ); + + goto end; + } + + if( p_hash[0] != sign.hash_verification[0] || + p_hash[1] != sign.hash_verification[1] ) + { + utf8_unlink( psz_destfile ); + intf_UserFatal( p_udt, true, _("File corrupted"), + _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."), + psz_destfile ); + msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile ); + free( p_hash ); + goto end; + } + + if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash ) + != VLC_SUCCESS ) + { + utf8_unlink( psz_destfile ); + intf_UserFatal( p_udt, true, _("File corrupted"), + _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."), + psz_destfile ); + msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile ); + free( p_hash ); + goto end; + } + + msg_Info( p_udt, "%s authenticated", psz_destfile ); + free( p_hash ); + +end: + if( p_stream ) + stream_Delete( p_stream ); + if( p_file ) + fclose( p_file ); + free( psz_destdir ); + free( psz_destfile ); + free( p_buffer ); + free( psz_size ); +} + +update_release_t *update_GetRelease( update_t *p_update ) +{ + return &p_update->release; +} + +#else +update_t *__update_New( vlc_object_t *p_this ) +{ + (void)p_this; + return NULL; +} + +void update_Delete( update_t *p_update ) +{ + (void)p_update; } +void update_Check( update_t *p_update, void (*pf_callback)( void*, bool ), + void *p_data ) +{ + (void)p_update; (void)pf_callback; (void)p_data; +} + +bool update_NeedUpgrade( update_t *p_update ) +{ + (void)p_update; + return false; +} + +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