#include "vlc_common.h"
#include <vlc_stream.h>
#include <vlc_strings.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include "update.h"
/* number of data bytes in a MPI */
#define mpi_len( mpi ) ( ( scalar_number( mpi, 2 ) + 7 ) / 8 )
+#define READ_MPI(n, bits) do { \
+ if( i_read + 2 > i_packet_len ) \
+ goto error; \
+ int len = mpi_len( p_buf ); \
+ if( len > (bits)/8 || i_read + 2 + len > i_packet_len ) \
+ goto error; \
+ len += 2; \
+ memcpy( n, p_buf, len ); \
+ p_buf += len; i_read += len; \
+ } while(0)
/*
* fill a public_key_packet_t structure from public key packet data
if( p_key->algo != PUBLIC_KEY_ALGO_DSA )
return VLC_EGENERIC;
- /* 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;
-
- 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->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;
-
- 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;
+ READ_MPI(p_key->p, 1024);
+ READ_MPI(p_key->q, 160);
+ READ_MPI(p_key->g, 1024);
+ READ_MPI(p_key->y, 1024);
if( i_read != i_packet_len ) /* some extra data eh ? */
return VLC_EGENERIC;
return VLC_SUCCESS;
+
+error:
+ return VLC_EGENERIC;
}
static int parse_signature_packet( signature_packet_t *p_sig,
- uint8_t *p_buf, size_t i_sig_len )
+ uint8_t *p_buf, size_t i_packet_len )
{
- if( !i_sig_len ) /* 1st sanity check, we need at least the version */
+ if( !i_packet_len ) /* 1st sanity check, we need at least the version */
return VLC_EGENERIC;
p_sig->version = *p_buf++;
switch( p_sig->version )
{
case 3:
- i_read = parse_signature_v3_packet( p_sig, p_buf, i_sig_len );
+ i_read = parse_signature_v3_packet( p_sig, p_buf, i_packet_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 );
+ i_read = parse_signature_v4_packet( p_sig, p_buf, i_packet_len );
break;
default:
return VLC_EGENERIC;
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;
+ READ_MPI(p_sig->r, 160);
+ READ_MPI(p_sig->s, 160);
- assert( i_read == i_sig_len );
- if( i_read < i_sig_len ) /* some extra data, hm ? */
+ assert( i_read == i_packet_len );
+ if( i_read < i_packet_len ) /* some extra data, hm ? */
goto error;
return VLC_SUCCESS;
}
-/* hash a text
- * * provided as a buffer (\0 terminated)
- * * with "\r\n" line endings if it's a text signature, else use UNIX line
- * * endings
- */
-static int hash_from_string( const char *psz_string, gcry_md_hd_t hd,
- bool text_signature )
-{
- while( *psz_string )
- {
- size_t i_len = strcspn( psz_string, "\r\n" );
- if( !i_len )
- break;
-
- gcry_md_write( hd, psz_string, i_len );
- if( text_signature )
- gcry_md_putc( hd, '\r' );
- gcry_md_putc( hd, '\n' );
-
- psz_string += i_len;
- while( *psz_string == '\r' || *psz_string == '\n' )
- psz_string++;
- }
-
- return 0;
-}
-
-
/* hash a binary file */
static int hash_from_binary_file( const char *psz_file, gcry_md_hd_t hd )
{
uint8_t buffer[4096];
size_t i_read;
- FILE *f = utf8_fopen( psz_file, "r" );
+ FILE *f = vlc_fopen( psz_file, "r" );
if( !f )
return -1;
if( gcry_md_open( &hd, GCRY_MD_SHA1, 0 ) )
return NULL;
- if( hash_from_string( psz_string, hd, p_sig->type == TEXT_SIGNATURE ) < 0 )
+ if( p_sig->type == TEXT_SIGNATURE )
+ while( *psz_string )
{
- gcry_md_close( hd );
- return NULL;
+ size_t i_len = strcspn( psz_string, "\r\n" );
+
+ if( i_len )
+ {
+ gcry_md_write( hd, psz_string, i_len );
+ psz_string += i_len;
+ }
+ gcry_md_putc( hd, '\r' );
+ gcry_md_putc( hd, '\n' );
+
+ if( *psz_string == '\r' )
+ psz_string++;
+ if( *psz_string == '\n' )
+ psz_string++;
}
+ else
+ gcry_md_write( hd, psz_string, strlen( psz_string ) );
return hash_finish( hd, p_sig );
}
p_hash[0] != p_pkey->sig.hash_verification[0] ||
p_hash[1] != p_pkey->sig.hash_verification[1] )
{
+ free(p_hash);
return NULL;
}
projects / vlc / blobdiff