From c7638fab2946fbbda3cbbf3fdbc79ae0b6c9dcec Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Tue, 12 Jun 2018 16:54:02 +0100 Subject: [PATCH] Fix ChangeLog entry after merge of HKDF Fix Changelog entry for the next version of Mbed TLS after merge of HKDF PR, --- ChangeLog | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ed35093f..fa235f809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ mbed TLS ChangeLog (Sorted per branch, date) Features * Add additional block mode, OFB (Output Feedback), to the AES module and cipher abstraction module. + * Implement the HMAC-based extract-and-expand key derivation function + (HKDF) per RFC 5869. Contributed by Thomas Fossati. = mbed TLS 2.10.0 branch released 2018-06-06 @@ -73,10 +75,6 @@ API Changes This function is necessary to determine when it is safe to idle on the underlying transport in case event-driven IO is used. -Features - * Implement the HMAC-based extract-and-expand key derivation function - (HKDF) per RFC 5869. Contributed by Thomas Fossati. - Bugfix * Fix a spurious uninitialized variable warning in cmac.c. Fix independently contributed by Brian J Murray and David Brown.