Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Add countermeasure against cache-based lucky 13

Conflicts:
	library/ssl_tls.c
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-29 02:13:42 +02:00
commit 8a81e84638
2 changed files with 4 additions and 1 deletions

View file

@ -1943,7 +1943,8 @@ static int ssl_decrypt_buf( mbedtls_ssl_context *ssl )
ssl->in_msglen );
mbedtls_md_hmac_finish( &ssl->transform_in->md_ctx_dec,
ssl->in_msg + ssl->in_msglen );
for( j = 0; j < extra_run; j++ )
/* Call md_process at least once due to cache attacks */
for( j = 0; j < extra_run + 1; j++ )
mbedtls_md_process( &ssl->transform_in->md_ctx_dec, ssl->in_msg );
mbedtls_md_hmac_reset( &ssl->transform_in->md_ctx_dec );