Merge remote-tracking branch 'public/pr/1617' into development
diff --git a/ChangeLog b/ChangeLog
index 23f4291..839e011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,15 +42,6 @@
* Add support for ARIA cipher (RFC 5794) and associated TLS ciphersuites
(RFC 6209). Disabled by default, see MBEDTLS_ARIA_C in config.h
-Bugfix
- * Fix an issue with MicroBlaze support in bn_mul.h which was causing the
- build to fail. Found by zv-io. Fixes #1651.
-
-Changes
- * Support TLS testing in out-of-source builds using cmake. Fixes #1193.
- * Fix redundant declaration of mbedtls_ssl_list_ciphersuites. Raised by
- TrinityTonic. #1359.
-
API Changes
* Extend the platform module with a util component that contains
functionality shared by multiple Mbed TLS modules. At this stage
@@ -62,6 +53,15 @@
Therefore, mbedtls_platform_zeroize() is moved to the platform module to
facilitate testing and maintenance.
+Bugfix
+ * Fix an issue with MicroBlaze support in bn_mul.h which was causing the
+ build to fail. Found by zv-io. Fixes #1651.
+
+Changes
+ * Support TLS testing in out-of-source builds using cmake. Fixes #1193.
+ * Fix redundant declaration of mbedtls_ssl_list_ciphersuites. Raised by
+ TrinityTonic. #1359.
+
= mbed TLS 2.9.0 branch released 2018-04-30
Security