Merge remote-tracking branch 'upstream-public/pr/1452' into mbedtls-2.1-proposed
diff --git a/ChangeLog b/ChangeLog
index 0eb0702..deeaccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
      implementation allowed an offline 2^80 brute force attack on the
      HMAC key of a single, uninterrupted connection (with no
      resumption of the session).
+   * Fix a buffer overread in ssl_parse_server_key_exchange() that could cause
+     a crash on invalid input.
 
 Features
    * Extend PKCS#8 interface by introducing support for the entire SHA
@@ -51,6 +53,8 @@
      structure. Do not assume that zeroizing a context is a correct way to
      reset it. Found independently by ccli8 on Github.
    * In mbedtls_entropy_free(), properly free the message digest context.
+   * Fix a possible arithmetic overflow in ssl_parse_server_key_exchange()
+     that could cause a key exchange to fail on valid data.
 
 Changes
    * Clarified the documentation of mbedtls_ssl_setup.