commit ca2ea4e217bab5fac250a256d4011899982332ba
author Brian J Murray <bmurray7jhu@gmail.com> Fri Jul 06 10:03:58 2018 -0700
committer Brian Murray <Brian@Clover.com> Mon Jul 23 10:34:47 2018 -0700
tree f7fffda4ff966e06a2a79b0f08e585dfe7ad8518
parent a61d123e0eb38509de08e2b32b696860f02fd4c0

Fix issue if salt = NULL and salt_len !=0 in mbedtls_hkdf_extract()

library/hkdf.c

diff --git a/library/hkdf.c b/library/hkdf.c
index 41d7d87..82d8a42 100644
--- a/library/hkdf.c
+++ b/library/hkdf.c
@@ -62,6 +62,11 @@
     {
         size_t hash_len;
 
+        if( salt_len != 0 )
+        {
+            return MBEDTLS_ERR_HKDF_BAD_INPUT_DATA;
+        }
+
         hash_len = mbedtls_md_get_size( md );
 
         if( hash_len == 0 )