Merge remote-tracking branch 'upstream-public/pr/2175' into development
diff --git a/ChangeLog b/ChangeLog
index 82782e1..e5b6a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
* Fix an unsafe bounds check when restoring an SSL session from a ticket.
This could lead to a buffer overflow, but only in case ticket authentication
was broken. Reported and fix suggested by Guido Vranken in #659.
+ * Add explicit integer to enumeration type casts to example program
+ programs/pkey/gen_key which previously led to compilation failure
+ on some toolchains. Reported by phoenixmcallister. Fixes #2170.
= mbed TLS 2.14.0 branch released 2018-11-19