Merge remote-tracking branch 'upstream-public/pr/2178' into mbedtls-2.1
diff --git a/ChangeLog b/ChangeLog
index 72b01f3..526e750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,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.1.17 branch released 2018-11-30