#include <gcrypt.h>
#include <vlc_gcrypt.h>
-#ifdef WIN32
+#ifdef _WIN32
#include <shellapi.h>
#endif
#include "update.h"
* Remaining text is a required description of the update
*/
-#if defined( UNDER_CE )
-# define UPDATE_OS_SUFFIX "-ce"
-#elif defined( WIN64 )
+#if defined( _WIN64 )
# define UPDATE_OS_SUFFIX "-win-x64"
-#elif defined( WIN32 )
+#elif defined( _WIN32 )
# define UPDATE_OS_SUFFIX "-win-x86"
#else
# define UPDATE_OS_SUFFIX ""
if( p_update->p_download )
{
- vlc_atomic_set( &p_update->p_download->aborted, 1 );
+ atomic_store( &p_update->p_download->aborted, true );
vlc_join( p_update->p_download->thread, NULL );
vlc_object_release( p_update->p_download );
}
}
const int64_t i_read = stream_Size( p_stream );
+
+ if( i_read < 0 || i_read >= UINT16_MAX)
+ {
+ msg_Err(p_update->p_libvlc, "Status file too large");
+ goto error;
+ }
+
psz_update_data = malloc( i_read + 1 ); /* terminating '\0' */
if( !psz_update_data )
goto error;
goto error;
}
- uint8_t *p_hash = hash_sha1_from_public_key( p_new_pkey );
+ uint8_t *p_hash = hash_from_public_key( p_new_pkey );
if( !p_hash )
{
msg_Err( p_update->p_libvlc, "Failed to hash signature" );
goto error;
}
- if( verify_signature( p_new_pkey->sig.r, p_new_pkey->sig.s,
+ if( verify_signature( &p_new_pkey->sig,
&p_update->p_pkey->key, p_hash ) == VLC_SUCCESS )
{
free( p_hash );
}
}
- uint8_t *p_hash = hash_sha1_from_text( psz_update_data, &sign );
+ uint8_t *p_hash = hash_from_text( psz_update_data, &sign );
if( !p_hash )
{
- msg_Warn( p_update->p_libvlc, "Can't compute SHA1 hash for status file" );
+ msg_Warn( p_update->p_libvlc, "Can't compute hash for status file" );
goto error;
}
else 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" );
+ msg_Warn( p_update->p_libvlc, "Bad hash for status file" );
+ free( p_hash );
goto error;
}
- else if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash )
+ else if( verify_signature( &sign, &p_update->p_pkey->key, p_hash )
!= VLC_SUCCESS )
{
msg_Err( p_update->p_libvlc, "BAD SIGNATURE for status file" );
+ free( p_hash );
goto error;
}
else
{
msg_Info( p_update->p_libvlc, "Status file authenticated" );
+ free( p_hash );
+ free( psz_version_line );
+ free( psz_update_data );
return true;
}
// If the object already exist, destroy it
if( p_update->p_download )
{
- vlc_atomic_set( &p_udt->p_download->aborted, 1 );
+ atomic_store( &p_update->p_download->aborted, true );
vlc_join( p_update->p_download->thread, NULL );
vlc_object_release( p_update->p_download );
}
p_update->p_download = p_udt;
p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
- vlc_atomic_set(&p_udt->aborted, 0);
+ atomic_store(&p_udt->aborted, false);
vlc_clone( &p_udt->thread, update_DownloadReal, p_udt, VLC_THREAD_PRIORITY_LOW );
}
if( p_progress == NULL )
goto end;
- while( !vlc_atomic_get( &p_udt->aborted ) &&
+ while( !atomic_load( &p_udt->aborted ) &&
( i_read = stream_Read( p_stream, p_buffer, 1 << 10 ) ) &&
!dialog_ProgressCancelled( p_progress ) )
{
fclose( p_file );
p_file = NULL;
- if( !vlc_atomic_get( &p_udt->aborted ) &&
+ if( !atomic_load( &p_udt->aborted ) &&
!dialog_ProgressCancelled( p_progress ) )
{
dialog_ProgressDestroy( p_progress );
goto end;
}
- uint8_t *p_hash = hash_sha1_from_file( psz_destfile, &sign );
+ uint8_t *p_hash = hash_from_file( psz_destfile, &sign );
if( !p_hash )
{
msg_Err( p_udt, "Unable to hash %s", 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 );
+ msg_Err( p_udt, "Bad hash for %s", psz_destfile );
free( p_hash );
goto end;
}
- if( verify_signature( sign.r, sign.s, &p_update->p_pkey->key, p_hash )
+ if( verify_signature( &sign, &p_update->p_pkey->key, p_hash )
!= VLC_SUCCESS )
{
vlc_unlink( psz_destfile );
msg_Info( p_udt, "%s authenticated", psz_destfile );
free( p_hash );
-#ifdef WIN32
+#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);