From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 5 Dec 2016 05:25:08 +0000 (+1030)
Subject: hkdf_sha256: okm is a void *.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=d07f742c5925b97ed558eb07aae285616f5df823;ds=sidebyside

hkdf_sha256: okm is a void *.

Making arbitrary bytes a uchar* is always a bit nasty for the caller.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/ccan/crypto/hkdf_sha256/hkdf_sha256.c b/ccan/crypto/hkdf_sha256/hkdf_sha256.c
index 0f264857..f36bf67a 100644
--- a/ccan/crypto/hkdf_sha256/hkdf_sha256.c
+++ b/ccan/crypto/hkdf_sha256/hkdf_sha256.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <string.h>
 
-void hkdf_sha256(unsigned char *okm, size_t okm_size,
+void hkdf_sha256(void *okm, size_t okm_size,
 		 const void *s, size_t ssize,
 		 const void *k, size_t ksize,
 		 const void *info, size_t isize)
@@ -83,7 +83,7 @@ void hkdf_sha256(unsigned char *okm, size_t okm_size,
 
 	while (okm_size > sizeof(t)) {
 		memcpy(okm, &t, sizeof(t));
-		okm += sizeof(t);
+		okm = (char *)okm + sizeof(t);
 		okm_size -= sizeof(t);
 
 		c++;
diff --git a/ccan/crypto/hkdf_sha256/hkdf_sha256.h b/ccan/crypto/hkdf_sha256/hkdf_sha256.h
index cb295027..cf95c5af 100644
--- a/ccan/crypto/hkdf_sha256/hkdf_sha256.h
+++ b/ccan/crypto/hkdf_sha256/hkdf_sha256.h
@@ -15,7 +15,7 @@
  * @info: pointer to info
  * @isize: the number of bytes pointed to by @info
  */
-void hkdf_sha256(unsigned char *okm, size_t okm_size,
+void hkdf_sha256(void *okm, size_t okm_size,
 		 const void *s, size_t ssize,
 		 const void *k, size_t ksize,
 		 const void *info, size_t isize);