Merge pull request #673 from gilles-peskine-arm/ctr_drbg-aes_fail-2.7

Backport 2.7: Uncaught AES failure in CTR_DRBG
This commit is contained in:
Jaeden Amero 2019-11-28 15:02:23 +00:00 committed by GitHub
commit 373a7097eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View file

@ -20,6 +20,10 @@ Security
timings on the comparison in the key generation enabled the attacker to
learn leading bits of the ephemeral key used during ECDSA signatures and to
recover the private key.
* Catch failure of AES functions in mbedtls_ctr_drbg_random(). Uncaught
failures could happen with alternative implementations of AES. Bug
reported and fix proposed by Johan Uppman Bruce and Christoffer Lauri,
Sectra.
Changes
* Add unit tests for AES-GCM when called through mbedtls_cipher_auth_xxx()

View file

@ -457,7 +457,7 @@ int mbedtls_ctr_drbg_random_with_add( void *p_rng,
exit:
mbedtls_zeroize( add_input, sizeof( add_input ) );
mbedtls_zeroize( tmp, sizeof( tmp ) );
return( 0 );
return( ret );
}
int mbedtls_ctr_drbg_random( void *p_rng, unsigned char *output, size_t output_len )