From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 6 Sep 2017 20:39:39 +0000 (+0200)
Subject: Merge branch 'hkdf-support'
X-Git-Tag: nettle_3.4rc1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=195edb37ac7a1ff799d09000af2aa7fc5bc10ea4;p=thirdparty%2Fnettle.git

Merge branch 'hkdf-support'
---

195edb37ac7a1ff799d09000af2aa7fc5bc10ea4
diff --cc ChangeLog
index 24bd92a9,145376c0..10167a71
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,19 +1,23 @@@
+ 2017-09-06  Niels Möller  <nisse@lysator.liu.se>
+ 
+ 	* hkdf.c (hkdf_expand): Eliminate a (signed) ssize_t variable, use
+ 	break rather than return at loop termination.
+ 
+ 2017-09-06  Niels Möller  <nisse@lysator.liu.se>
+ 
+ 	HKDF implementation, contributed by Nikos Mavrogiannopoulos.
+ 	* hkdf.c (hkdf_extract, hkdf_expand): New file, new functions.
+ 	* hkdf.h: New file.
+ 	* Makefile.in (nettle_SOURCES): Add hkdf.c.
+ 	(HEADERS): Add hkdf.h.
+ 	* testsuite/hkdf-test.c: Tests for hkdf-sha256 and hkdf-sha1.
+ 	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added hkdf-test.c.
+ 	* nettle.texinfo (Key derivation functions): Document HKDF.
+ 
 +2017-09-04  Andreas Schneider  <asn@samba.org>
 +
 +	* fat-arm.c: Add missing define for _GNU_SOURCE.
 +
  2017-08-27  Niels Möller  <nisse@lysator.liu.se>
  
  	* configure.ac (GMP_NUMB_BITS): Set to dummy value "n/a" in