Fix some MSVC12 conversion warnings

This commit is contained in:
Manuel Pégourié-Gonnard 2014-03-21 10:54:55 +01:00
parent 3b6269aa08
commit 9592485d0c
3 changed files with 4 additions and 4 deletions

View File

@ -456,7 +456,7 @@ static const unsigned char result_nopr[16] =
{ 0xa0, 0x54, 0x30, 0x3d, 0x8a, 0x7e, 0xa9, 0x88, { 0xa0, 0x54, 0x30, 0x3d, 0x8a, 0x7e, 0xa9, 0x88,
0x9d, 0x90, 0x3e, 0x07, 0x7c, 0x6f, 0x21, 0x8f }; 0x9d, 0x90, 0x3e, 0x07, 0x7c, 0x6f, 0x21, 0x8f };
static int test_offset; static size_t test_offset;
static int ctr_drbg_self_test_entropy( void *data, unsigned char *buf, static int ctr_drbg_self_test_entropy( void *data, unsigned char *buf,
size_t len ) size_t len )
{ {

View File

@ -49,7 +49,7 @@
* *
* Argument is the minimum size in bytes of the MD output. * Argument is the minimum size in bytes of the MD output.
*/ */
static const md_info_t *md_info_by_size( int min_size ) static const md_info_t *md_info_by_size( size_t min_size )
{ {
const md_info_t *md_cur, *md_picked = NULL; const md_info_t *md_cur, *md_picked = NULL;
const int *md_alg; const int *md_alg;
@ -57,7 +57,7 @@ static const md_info_t *md_info_by_size( int min_size )
for( md_alg = md_list(); *md_alg != 0; md_alg++ ) for( md_alg = md_list(); *md_alg != 0; md_alg++ )
{ {
if( ( md_cur = md_info_from_type( *md_alg ) ) == NULL || if( ( md_cur = md_info_from_type( *md_alg ) ) == NULL ||
md_cur->size < min_size || (size_t) md_cur->size < min_size ||
( md_picked != NULL && md_cur->size > md_picked->size ) ) ( md_picked != NULL && md_cur->size > md_picked->size ) )
continue; continue;

View File

@ -414,7 +414,7 @@ static const unsigned char result_nopr[OUTPUT_LEN] = {
0xe8, 0x5f, 0x13, 0x0f, 0xc8, 0xa4, 0x59, 0xb7 }; 0xe8, 0x5f, 0x13, 0x0f, 0xc8, 0xa4, 0x59, 0xb7 };
/* "Entropy" from buffer */ /* "Entropy" from buffer */
static int test_offset; static size_t test_offset;
static int hmac_drbg_self_test_entropy( void *data, static int hmac_drbg_self_test_entropy( void *data,
unsigned char *buf, size_t len ) unsigned char *buf, size_t len )
{ {