commit 86d32e690ccc08914fdc5c21527bfd23c00d7f35
author Simon Butcher <simon.butcher@arm.com> Wed Sep 26 22:39:29 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Wed Sep 26 22:40:09 2018 +0100
tree d234e679c569da3596d7491d919927c49a815be4
parent 0624b76361ff7ccd781955d2d4bc231b658b2cf9
parent 1a60330e08b335284ec29cd44ebc5ce1e234b1e2

Merge remote-tracking branch 'public/pr/1973' into mbedtls-2.1

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1a1845e..64dce14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 Bugfix
     * Fix failure in hmac_drbg in the benchmark sample application, when
       MBEDTLS_THREADING_C is defined. Found by TrinityTonic, #1095
+    * Fix a bug in the update function for SSL ticket keys which previously
+      invalidated keys of a lifetime of less than a 1s. Fixes #1968.
+
+Changes
+   * Add tests for session resumption in DTLS.
 
 = mbed TLS 2.1.15 branch released 2018-08-31