Merge remote-tracking branch 'origin/misc-1.3' into mbedtls-1.3

This commit is contained in:
Simon Butcher 2015-12-22 20:15:35 +00:00
commit caa8b4977c
2 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,10 @@
mbed TLS ChangeLog (Sorted per branch, date)
= mbed TLS 1.3.16 released 2015-12-xx
Bugfix
* Fix over-restricive length limit in GCM. Found by Andreas-N. #362
= mbed TLS 1.3.15 released 2015-11-04
Security

View File

@ -357,7 +357,7 @@ int gcm_update( gcm_context *ctx,
/* Total length is restricted to 2^39 - 256 bits, ie 2^36 - 2^5 bytes
* Also check for possible overflow */
if( ctx->len + length < ctx->len ||
(uint64_t) ctx->len + length > 0x03FFFFE0ull )
(uint64_t) ctx->len + length > 0xFFFFFFFE0ull )
{
return( POLARSSL_ERR_GCM_BAD_INPUT );
}