commit 448146407f9d02aaf577700817fefea123067181
author Hanno Becker <hanno.becker@arm.com> Fri Aug 03 09:53:48 2018 +0100
committer Hanno Becker <hanno.becker@arm.com> Fri Aug 03 10:07:39 2018 +0100
tree cb6912a72ea63cd0bf9beb99f86a0d22612b1290
parent 5b559ac7ab88849a340e652022f991ebbd8f076b

Adapt ChangeLog

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index bda3de8..d5101f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 Bugfix
    * Fixes an issue with MBEDTLS_CHACHAPOLY_C which would not compile if
      MBEDTLS_ARC4_C and MBEDTLS_CIPHER_NULL_CIPHER weren't also defined. #1890
+   * Fix a miscalculation of the maximum record expansion in
+     mbedtls_ssl_get_record_expansion() in case of ChachaPoly ciphersuites,
+     or CBC ciphersuites in (D)TLS versions 1.1 or higher. Fixes #1913, #1914.
 
 = mbed TLS 2.12.0 branch released 2018-07-25