Merge remote-tracking branch 'upstream-public/pr/1062' into development
diff --git a/ChangeLog b/ChangeLog
index 0d323b1..b510b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
* Fix leap year calculation in x509_date_is_valid() to ensure that invalid
dates on leap years with 100 and 400 intervals are handled correctly. Found
by Nicholas Wilson. #694
+ * Fix out-of-memory problem when parsing 4096-bit PKCS8-encrypted RSA keys.
+ Found independently by Florian in the mbed TLS forum and by Mishamax.
+ #878, #1019.
= mbed TLS 2.6.0 branch released 2017-08-10