Merge remote-tracking branch 'public/pr/1497' into development

2018-06-12 16:53:04 +01:00 · 2018-06-12 16:53:04 +01:00 · e47d6fd97e
commit e47d6fd97e
parent ebe23ed738 10e0e4d4ff
16 changed files with 627 additions and 4 deletions
--- a/library/Makefile
+++ b/library/Makefile
@ -57,6 +57,7 @@ OBJS_CRYPTO=	aes.o		aesni.o		arc4.o		\
 		ecjpake.o	ecp.o				\
 		ecp_curves.o	entropy.o	entropy_poll.o	\
 		error.o		gcm.o		havege.o	\
+		hkdf.o						\
 		hmac_drbg.o	md.o		md2.o		\
 		md4.o		md5.o		md_wrap.o	\
 		memory_buffer_alloc.o		oid.o		\