commit caa8b4977c4af9b733b7ebce5c8ad8b5a5c48112
author Simon Butcher <simon.butcher@arm.com> Tue Dec 22 20:15:35 2015 +0000
committer Simon Butcher <simon.butcher@arm.com> Tue Dec 22 20:15:35 2015 +0000
tree 2cdaa0c127b4061abbd8d10aa43e503105ff5546
parent cf16b79238793bebd451b34838bbac2f299657ab
parent c05014459ed2d1d349d60aafb43c0e3cfc2c38ed

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

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index bf31b70..5701cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

library/gcm.c

diff --git a/library/gcm.c b/library/gcm.c
index b537b02..83f2fd2 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -357,7 +357,7 @@
     /* 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 );
     }