mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 01:35:27 +00:00
Merge pull request #3938 from geecrypt/mbedtls-2.16
Backport to Mbedtls 2.16: Support set *_drbg reseed interval before seed
This commit is contained in:
commit
3f35b87db9
3
ChangeLog.d/bugfix-2927.txt
Normal file
3
ChangeLog.d/bugfix-2927.txt
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
Bugfix
|
||||||
|
* In CTR_DRBG and HMAC_DRBG, don't reset the reseed interval in seed().
|
||||||
|
Fixes #2927.
|
|
@ -224,6 +224,11 @@ mbedtls_ctr_drbg_context;
|
||||||
* and prepares it for mbedtls_ctr_drbg_seed()
|
* and prepares it for mbedtls_ctr_drbg_seed()
|
||||||
* or mbedtls_ctr_drbg_free().
|
* or mbedtls_ctr_drbg_free().
|
||||||
*
|
*
|
||||||
|
* \note The reseed interval is
|
||||||
|
* #MBEDTLS_CTR_DRBG_RESEED_INTERVAL by default.
|
||||||
|
* You can override it by calling
|
||||||
|
* mbedtls_ctr_drbg_set_reseed_interval().
|
||||||
|
*
|
||||||
* \param ctx The CTR_DRBG context to initialize.
|
* \param ctx The CTR_DRBG context to initialize.
|
||||||
*/
|
*/
|
||||||
void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx );
|
void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx );
|
||||||
|
@ -305,7 +310,8 @@ int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx,
|
||||||
size_t len );
|
size_t len );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief This function clears CTR_CRBG context data.
|
* \brief This function resets CTR_DRBG context to the state immediately
|
||||||
|
* after initial call of mbedtls_ctr_drbg_init().
|
||||||
*
|
*
|
||||||
* \param ctx The CTR_DRBG context to clear.
|
* \param ctx The CTR_DRBG context to clear.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -138,6 +138,10 @@ typedef struct mbedtls_hmac_drbg_context
|
||||||
* This function makes the context ready for mbedtls_hmac_drbg_seed(),
|
* This function makes the context ready for mbedtls_hmac_drbg_seed(),
|
||||||
* mbedtls_hmac_drbg_seed_buf() or mbedtls_hmac_drbg_free().
|
* mbedtls_hmac_drbg_seed_buf() or mbedtls_hmac_drbg_free().
|
||||||
*
|
*
|
||||||
|
* \note The reseed interval is #MBEDTLS_HMAC_DRBG_RESEED_INTERVAL
|
||||||
|
* by default. Override this value by calling
|
||||||
|
* mbedtls_hmac_drbg_set_reseed_interval().
|
||||||
|
*
|
||||||
* \param ctx HMAC_DRBG context to be initialized.
|
* \param ctx HMAC_DRBG context to be initialized.
|
||||||
*/
|
*/
|
||||||
void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx );
|
void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx );
|
||||||
|
@ -361,7 +365,8 @@ int mbedtls_hmac_drbg_random_with_add( void *p_rng,
|
||||||
int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len );
|
int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Free an HMAC_DRBG context
|
* \brief This function resets HMAC_DRBG context to the state immediately
|
||||||
|
* after initial call of mbedtls_hmac_drbg_init().
|
||||||
*
|
*
|
||||||
* \param ctx The HMAC_DRBG context to free.
|
* \param ctx The HMAC_DRBG context to free.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -82,11 +82,17 @@ void mbedtls_ctr_drbg_init( mbedtls_ctr_drbg_context *ctx )
|
||||||
{
|
{
|
||||||
memset( ctx, 0, sizeof( mbedtls_ctr_drbg_context ) );
|
memset( ctx, 0, sizeof( mbedtls_ctr_drbg_context ) );
|
||||||
|
|
||||||
|
ctx->reseed_interval = MBEDTLS_CTR_DRBG_RESEED_INTERVAL;
|
||||||
|
|
||||||
#if defined(MBEDTLS_THREADING_C)
|
#if defined(MBEDTLS_THREADING_C)
|
||||||
mbedtls_mutex_init( &ctx->mutex );
|
mbedtls_mutex_init( &ctx->mutex );
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function resets CTR_DRBG context to the state immediately
|
||||||
|
* after initial call of mbedtls_ctr_drbg_init().
|
||||||
|
*/
|
||||||
void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx )
|
void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx )
|
||||||
{
|
{
|
||||||
if( ctx == NULL )
|
if( ctx == NULL )
|
||||||
|
@ -97,6 +103,10 @@ void mbedtls_ctr_drbg_free( mbedtls_ctr_drbg_context *ctx )
|
||||||
#endif
|
#endif
|
||||||
mbedtls_aes_free( &ctx->aes_ctx );
|
mbedtls_aes_free( &ctx->aes_ctx );
|
||||||
mbedtls_platform_zeroize( ctx, sizeof( mbedtls_ctr_drbg_context ) );
|
mbedtls_platform_zeroize( ctx, sizeof( mbedtls_ctr_drbg_context ) );
|
||||||
|
ctx->reseed_interval = MBEDTLS_CTR_DRBG_RESEED_INTERVAL;
|
||||||
|
#if defined(MBEDTLS_THREADING_C)
|
||||||
|
mbedtls_mutex_init( &ctx->mutex );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx, int resistance )
|
void mbedtls_ctr_drbg_set_prediction_resistance( mbedtls_ctr_drbg_context *ctx, int resistance )
|
||||||
|
@ -419,7 +429,6 @@ int mbedtls_ctr_drbg_seed( mbedtls_ctr_drbg_context *ctx,
|
||||||
|
|
||||||
if( ctx->entropy_len == 0 )
|
if( ctx->entropy_len == 0 )
|
||||||
ctx->entropy_len = MBEDTLS_CTR_DRBG_ENTROPY_LEN;
|
ctx->entropy_len = MBEDTLS_CTR_DRBG_ENTROPY_LEN;
|
||||||
ctx->reseed_interval = MBEDTLS_CTR_DRBG_RESEED_INTERVAL;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize with an empty key
|
* Initialize with an empty key
|
||||||
|
|
|
@ -83,6 +83,8 @@ void mbedtls_hmac_drbg_init( mbedtls_hmac_drbg_context *ctx )
|
||||||
{
|
{
|
||||||
memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
|
memset( ctx, 0, sizeof( mbedtls_hmac_drbg_context ) );
|
||||||
|
|
||||||
|
ctx->reseed_interval = MBEDTLS_HMAC_DRBG_RESEED_INTERVAL;
|
||||||
|
|
||||||
#if defined(MBEDTLS_THREADING_C)
|
#if defined(MBEDTLS_THREADING_C)
|
||||||
mbedtls_mutex_init( &ctx->mutex );
|
mbedtls_mutex_init( &ctx->mutex );
|
||||||
#endif
|
#endif
|
||||||
|
@ -296,8 +298,6 @@ int mbedtls_hmac_drbg_seed( mbedtls_hmac_drbg_context *ctx,
|
||||||
ctx->f_entropy = f_entropy;
|
ctx->f_entropy = f_entropy;
|
||||||
ctx->p_entropy = p_entropy;
|
ctx->p_entropy = p_entropy;
|
||||||
|
|
||||||
ctx->reseed_interval = MBEDTLS_HMAC_DRBG_RESEED_INTERVAL;
|
|
||||||
|
|
||||||
if( ctx->entropy_len == 0 )
|
if( ctx->entropy_len == 0 )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -442,7 +442,8 @@ int mbedtls_hmac_drbg_random( void *p_rng, unsigned char *output, size_t out_len
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Free an HMAC_DRBG context
|
* This function resets HMAC_DRBG context to the state immediately
|
||||||
|
* after initial call of mbedtls_hmac_drbg_init().
|
||||||
*/
|
*/
|
||||||
void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx )
|
void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx )
|
||||||
{
|
{
|
||||||
|
@ -454,6 +455,10 @@ void mbedtls_hmac_drbg_free( mbedtls_hmac_drbg_context *ctx )
|
||||||
#endif
|
#endif
|
||||||
mbedtls_md_free( &ctx->md_ctx );
|
mbedtls_md_free( &ctx->md_ctx );
|
||||||
mbedtls_platform_zeroize( ctx, sizeof( mbedtls_hmac_drbg_context ) );
|
mbedtls_platform_zeroize( ctx, sizeof( mbedtls_hmac_drbg_context ) );
|
||||||
|
ctx->reseed_interval = MBEDTLS_HMAC_DRBG_RESEED_INTERVAL;
|
||||||
|
#if defined(MBEDTLS_THREADING_C)
|
||||||
|
mbedtls_mutex_init( &ctx->mutex );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MBEDTLS_FS_IO)
|
#if defined(MBEDTLS_FS_IO)
|
||||||
|
|
|
@ -206,13 +206,16 @@ void ctr_drbg_entropy_usage( )
|
||||||
memset( out, 0, sizeof( out ) );
|
memset( out, 0, sizeof( out ) );
|
||||||
memset( add, 0, sizeof( add ) );
|
memset( add, 0, sizeof( add ) );
|
||||||
|
|
||||||
|
/* Set reseed interval before seed */
|
||||||
|
mbedtls_ctr_drbg_set_reseed_interval( &ctx, 2 * reps );
|
||||||
|
|
||||||
/* Init must use entropy */
|
/* Init must use entropy */
|
||||||
last_idx = test_offset_idx;
|
last_idx = test_offset_idx;
|
||||||
TEST_ASSERT( mbedtls_ctr_drbg_seed( &ctx, mbedtls_test_entropy_func, entropy, NULL, 0 ) == 0 );
|
TEST_ASSERT( mbedtls_ctr_drbg_seed( &ctx, mbedtls_test_entropy_func, entropy, NULL, 0 ) == 0 );
|
||||||
TEST_ASSERT( last_idx < test_offset_idx );
|
TEST_ASSERT( last_idx < test_offset_idx );
|
||||||
|
|
||||||
/* By default, PR is off and reseed_interval is large,
|
/* By default, PR is off, and reseed interval was set to
|
||||||
* so the next few calls should not use entropy */
|
* 2 * reps so the next few calls should not use entropy */
|
||||||
last_idx = test_offset_idx;
|
last_idx = test_offset_idx;
|
||||||
for( i = 0; i < reps; i++ )
|
for( i = 0; i < reps; i++ )
|
||||||
{
|
{
|
||||||
|
@ -228,15 +231,16 @@ void ctr_drbg_entropy_usage( )
|
||||||
TEST_ASSERT( out[sizeof( out ) - 2] == 0 );
|
TEST_ASSERT( out[sizeof( out ) - 2] == 0 );
|
||||||
TEST_ASSERT( out[sizeof( out ) - 1] == 0 );
|
TEST_ASSERT( out[sizeof( out ) - 1] == 0 );
|
||||||
|
|
||||||
/* Set reseed_interval to the number of calls done,
|
/* There have been 2 * reps calls to random. The next call should reseed */
|
||||||
* so the next call should reseed */
|
|
||||||
mbedtls_ctr_drbg_set_reseed_interval( &ctx, 2 * reps );
|
|
||||||
TEST_ASSERT( mbedtls_ctr_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
TEST_ASSERT( mbedtls_ctr_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
||||||
TEST_ASSERT( last_idx < test_offset_idx );
|
TEST_ASSERT( last_idx < test_offset_idx );
|
||||||
|
|
||||||
/* The new few calls should not reseed */
|
/* Set reseed interval after seed */
|
||||||
|
mbedtls_ctr_drbg_set_reseed_interval( &ctx, 4 * reps + 1 );
|
||||||
|
|
||||||
|
/* The next few calls should not reseed */
|
||||||
last_idx = test_offset_idx;
|
last_idx = test_offset_idx;
|
||||||
for( i = 0; i < reps / 2; i++ )
|
for( i = 0; i < (2 * reps); i++ )
|
||||||
{
|
{
|
||||||
TEST_ASSERT( mbedtls_ctr_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
TEST_ASSERT( mbedtls_ctr_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
||||||
TEST_ASSERT( mbedtls_ctr_drbg_random_with_add( &ctx, out, sizeof( out ) ,
|
TEST_ASSERT( mbedtls_ctr_drbg_random_with_add( &ctx, out, sizeof( out ) ,
|
||||||
|
|
|
@ -49,14 +49,17 @@ void hmac_drbg_entropy_usage( int md_alg )
|
||||||
md_info = mbedtls_md_info_from_type( md_alg );
|
md_info = mbedtls_md_info_from_type( md_alg );
|
||||||
TEST_ASSERT( md_info != NULL );
|
TEST_ASSERT( md_info != NULL );
|
||||||
|
|
||||||
|
/* Set reseed interval before seed */
|
||||||
|
mbedtls_hmac_drbg_set_reseed_interval( &ctx, 2 * reps );
|
||||||
|
|
||||||
/* Init must use entropy */
|
/* Init must use entropy */
|
||||||
last_len = entropy.len;
|
last_len = entropy.len;
|
||||||
TEST_ASSERT( mbedtls_hmac_drbg_seed( &ctx, md_info, mbedtls_test_entropy_func, &entropy,
|
TEST_ASSERT( mbedtls_hmac_drbg_seed( &ctx, md_info, mbedtls_test_entropy_func, &entropy,
|
||||||
NULL, 0 ) == 0 );
|
NULL, 0 ) == 0 );
|
||||||
TEST_ASSERT( entropy.len < last_len );
|
TEST_ASSERT( entropy.len < last_len );
|
||||||
|
|
||||||
/* By default, PR is off and reseed_interval is large,
|
/* By default, PR is off, and reseed interval was set to
|
||||||
* so the next few calls should not use entropy */
|
* 2 * reps so the next few calls should not use entropy */
|
||||||
last_len = entropy.len;
|
last_len = entropy.len;
|
||||||
for( i = 0; i < reps; i++ )
|
for( i = 0; i < reps; i++ )
|
||||||
{
|
{
|
||||||
|
@ -72,15 +75,16 @@ void hmac_drbg_entropy_usage( int md_alg )
|
||||||
TEST_ASSERT( out[sizeof( out ) - 2] == 0 );
|
TEST_ASSERT( out[sizeof( out ) - 2] == 0 );
|
||||||
TEST_ASSERT( out[sizeof( out ) - 1] == 0 );
|
TEST_ASSERT( out[sizeof( out ) - 1] == 0 );
|
||||||
|
|
||||||
/* Set reseed_interval to the number of calls done,
|
/* There have been 2 * reps calls to random. The next call should reseed */
|
||||||
* so the next call should reseed */
|
|
||||||
mbedtls_hmac_drbg_set_reseed_interval( &ctx, 2 * reps );
|
|
||||||
TEST_ASSERT( mbedtls_hmac_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
TEST_ASSERT( mbedtls_hmac_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
||||||
TEST_ASSERT( entropy.len < last_len );
|
TEST_ASSERT( entropy.len < last_len );
|
||||||
|
|
||||||
|
/* Set reseed interval after seed */
|
||||||
|
mbedtls_hmac_drbg_set_reseed_interval( &ctx, 4 * reps + 1);
|
||||||
|
|
||||||
/* The new few calls should not reseed */
|
/* The new few calls should not reseed */
|
||||||
last_len = entropy.len;
|
last_len = entropy.len;
|
||||||
for( i = 0; i < reps / 2; i++ )
|
for( i = 0; i < (2 * reps); i++ )
|
||||||
{
|
{
|
||||||
TEST_ASSERT( mbedtls_hmac_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
TEST_ASSERT( mbedtls_hmac_drbg_random( &ctx, out, sizeof( out ) ) == 0 );
|
||||||
TEST_ASSERT( mbedtls_hmac_drbg_random_with_add( &ctx, out, sizeof( out ) ,
|
TEST_ASSERT( mbedtls_hmac_drbg_random_with_add( &ctx, out, sizeof( out ) ,
|
||||||
|
@ -189,7 +193,7 @@ void hmac_drbg_no_reseed( int md_alg, data_t * entropy,
|
||||||
TEST_ASSERT( mbedtls_hmac_drbg_random_with_add( &ctx, my_output, output->len,
|
TEST_ASSERT( mbedtls_hmac_drbg_random_with_add( &ctx, my_output, output->len,
|
||||||
add2->x, add2->len ) == 0 );
|
add2->x, add2->len ) == 0 );
|
||||||
|
|
||||||
/* clear for second run */
|
/* Reset context for second run */
|
||||||
mbedtls_hmac_drbg_free( &ctx );
|
mbedtls_hmac_drbg_free( &ctx );
|
||||||
|
|
||||||
TEST_ASSERT( memcmp( my_output, output->x, output->len ) == 0 );
|
TEST_ASSERT( memcmp( my_output, output->x, output->len ) == 0 );
|
||||||
|
|
Loading…
Reference in a new issue