commit 0980d9a3ae8e1ce3ec0af5f3b590c32e77aa0cf4
author Jaeden Amero <jaeden.amero@arm.com> Wed Mar 14 17:53:27 2018 +0000
committer Jaeden Amero <jaeden.amero@arm.com> Wed Mar 14 17:53:27 2018 +0000
tree aebe86e6139d9748b743eefed3cdc3eb9f2795f6
parent 4e3629590f9d6f6d0e4587bf19a12514dad2b396
parent a7a8332402c9d894c26cf4f4c47f72b0d6f29642

Merge remote-tracking branch 'upstream-public/pr/1450' into mbedtls-2.1-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index deeaccd..ae31305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
      resumption of the session).
    * Fix a buffer overread in ssl_parse_server_key_exchange() that could cause
      a crash on invalid input.
+   * Fix a buffer overread in ssl_parse_server_psk_hint() that could cause a
+     crash on invalid input.
 
 Features
    * Extend PKCS#8 interface by introducing support for the entire SHA
@@ -55,6 +57,8 @@
    * 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.
+   * Fix a possible arithmetic overflow in ssl_parse_server_psk_hint() that
+     could cause a key exchange to fail on valid data.
 
 Changes
    * Clarified the documentation of mbedtls_ssl_setup.