From 04450488ec7df9f573da78b4b2346894eadf0d73 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Sat, 31 Mar 2018 22:57:03 +0200
Subject: [PATCH] Add ChangeLog entry to credit independent contribution

Also: fixes #1437
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0eb0702129..ed8cb16cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@ Bugfix
 
 Changes
    * Clarified the documentation of mbedtls_ssl_setup.
+   * 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.1.10 branch released 2018-02-03