Merge remote-tracking branch 'upstream-public/pr/1497' into evaluation-2
diff --git a/ChangeLog b/ChangeLog
index 022ea97..cf7d13a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
Therefore, mbedtls_platform_zeroize() is moved to the platform module to
facilitate testing and maintenance.
+Features
+ * Implement HKDF per RFC 5869. Contributed by Thomas Fossati.
+
= mbed TLS 2.9.0 branch released 2018-04-30
Security
@@ -54,9 +57,6 @@
This function is necessary to determine when it is safe to idle on the
underlying transport in case event-driven IO is used.
-Features
- * Implement HKDF per RFC 5869. Contributed by Thomas Fossati.
-
Bugfix
* Fix a spurious uninitialized variable warning in cmac.c. Fix independently
contributed by Brian J Murray and David Brown.