Merge remote-tracking branch 'tmp/readme-fix' into development
* tmp/readme-fix:
Removing yt ls step in READMEs of examples
diff --git a/library/timing.c b/library/timing.c
index aee9dd4..6c4d576 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -414,7 +414,9 @@
millisecs = mbedtls_timing_get_timer( &hires, 0 );
- if( millisecs < 900 * secs || millisecs > 1100 * secs )
+ /* For some reason on Windows it looks like alarm has an extra delay
+ * (maybe related to creating a new thread). Allow some room here. */
+ if( millisecs < 800 * secs || millisecs > 1200 * secs + 300 )
{
if( verbose != 0 )
mbedtls_printf( "failed\n" );
diff --git a/tests/suites/test_suite_pkwrite.function b/tests/suites/test_suite_pkwrite.function
index cbe1c1c..1c98bd1 100644
--- a/tests/suites/test_suite_pkwrite.function
+++ b/tests/suites/test_suite_pkwrite.function
@@ -25,16 +25,16 @@
mbedtls_pk_init( &key );
TEST_ASSERT( mbedtls_pk_parse_public_keyfile( &key, key_file ) == 0 );
- ret = mbedtls_pk_write_pubkey_pem( &key, buf, sizeof( buf ) - 1);
- TEST_ASSERT( ret >= 0 );
+ ret = mbedtls_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:
mbedtls_pk_free( &key );
@@ -57,16 +57,16 @@
mbedtls_pk_init( &key );
TEST_ASSERT( mbedtls_pk_parse_keyfile( &key, key_file, NULL ) == 0 );
- ret = mbedtls_pk_write_key_pem( &key, buf, sizeof( buf ) - 1);
+ ret = mbedtls_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:
mbedtls_pk_free( &key );