Merge remote-tracking branch 'ptahpeteh/patch-1' into mbedtls-1.3

* ptahpeteh/patch-1:
  Serious bug fix in entropy.c
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-02 09:03:06 +01:00
commit 468b06dab0

View file

@ -94,10 +94,10 @@ void entropy_free( entropy_context *ctx )
#if defined(POLARSSL_HAVEGE_C) #if defined(POLARSSL_HAVEGE_C)
havege_free( &ctx->havege_data ); havege_free( &ctx->havege_data );
#endif #endif
polarssl_zeroize( ctx, sizeof( entropy_context ) );
#if defined(POLARSSL_THREADING_C) #if defined(POLARSSL_THREADING_C)
polarssl_mutex_free( &ctx->mutex ); polarssl_mutex_free( &ctx->mutex );
#endif #endif
polarssl_zeroize( ctx, sizeof( entropy_context ) );
} }
int entropy_add_source( entropy_context *ctx, int entropy_add_source( entropy_context *ctx,