Merge branch 'fix/hkdf' into develop

This fixes #81
2015-12-05 14:04:33 +01:00 · 2015-12-05 14:04:33 +01:00 · 8def190877
commit 8def190877
parent 318dbbccc3 f5016d88dd
1 changed files with 3 additions and 1 deletions
--- a/src/misc/hkdf/hkdf.c
+++ b/src/misc/hkdf/hkdf.c
@ -61,7 +61,9 @@ int hkdf_expand(int hash_idx, const unsigned char *info, unsigned long infolen,
   if (T == NULL) {
      return CRYPT_MEM;
   }
+   if (info != NULL) {
      XMEMCPY(T + hashsize, info, infolen);
+   }

   /* HMAC data T(1) doesn't include a previous hash value */
   dat    = T    + hashsize;