From ce11699cf2d34db187877f02ae25fcaa71e83005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 18 Aug 2015 19:49:40 +0200 Subject: [PATCH] Fix pkwrite test that were failing on mingw32 Apparently fread() writes some junk after the contents of the file. Don't look at it. --- tests/suites/test_suite_pkwrite.function | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/suites/test_suite_pkwrite.function b/tests/suites/test_suite_pkwrite.function index 8b5fafbc0..f99f561e6 100644 --- a/tests/suites/test_suite_pkwrite.function +++ b/tests/suites/test_suite_pkwrite.function @@ -25,16 +25,16 @@ void pk_write_pubkey_check( char *key_file ) pk_init( &key ); TEST_ASSERT( pk_parse_public_keyfile( &key, key_file ) == 0 ); - ret = pk_write_pubkey_pem( &key, buf, sizeof( buf ) - 1); - TEST_ASSERT( ret >= 0 ); + ret = pk_write_pubkey_pem( &key, buf, sizeof( buf )); + TEST_ASSERT( ret == 0 ); f = fopen( key_file, "r" ); TEST_ASSERT( f != NULL ); - ilen = fread( check_buf, 1, sizeof( check_buf ) - 1, f ); + ilen = fread( check_buf, 1, sizeof( check_buf ), f ); fclose( f ); TEST_ASSERT( ilen == strlen( (char *) buf ) ); - TEST_ASSERT( strncmp( (char *) buf, (char *) check_buf, sizeof( buf ) ) == 0 ); + TEST_ASSERT( memcmp( (char *) buf, (char *) check_buf, ilen ) == 0 ); exit: pk_free( &key ); @@ -57,16 +57,16 @@ void pk_write_key_check( char *key_file ) pk_init( &key ); TEST_ASSERT( pk_parse_keyfile( &key, key_file, NULL ) == 0 ); - ret = pk_write_key_pem( &key, buf, sizeof( buf ) - 1); - TEST_ASSERT( ret >= 0 ); + ret = pk_write_key_pem( &key, buf, sizeof( buf )); + TEST_ASSERT( ret == 0 ); f = fopen( key_file, "r" ); TEST_ASSERT( f != NULL ); - ilen = fread( check_buf, 1, sizeof( check_buf ) - 1, f ); + ilen = fread( check_buf, 1, sizeof( check_buf ), f ); fclose( f ); TEST_ASSERT( ilen == strlen( (char *) buf ) ); - TEST_ASSERT( strncmp( (char *) buf, (char *) check_buf, sizeof( buf ) ) == 0 ); + TEST_ASSERT( memcmp( (char *) buf, (char *) check_buf, ilen ) == 0 ); exit: pk_free( &key );