Merge remote-tracking branch 'upstream-public/pr/1464' into mbedtls-2.7-proposed
diff --git a/ChangeLog b/ChangeLog
index 2c14930..362f303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
* Verify that when (f_send, f_recv and f_recv_timeout) send or receive
more than the required length an error is returned. Raised by
Sam O'Connor in #1245.
+ * Improve robustness of mbedtls_ssl_derive_keys against the use of
+ HMAC functions with non-HMAC ciphersuites. Independently contributed
+ by Jiayuan Chen in #1377. Fixes #1437.
= mbed TLS 2.7.2 branch released 2018-03-16