From d07f742c5925b97ed558eb07aae285616f5df823 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 5 Dec 2016 15:55:08 +1030 Subject: [PATCH 1/1] hkdf_sha256: okm is a void *. Making arbitrary bytes a uchar* is always a bit nasty for the caller. Signed-off-by: Rusty Russell --- ccan/crypto/hkdf_sha256/hkdf_sha256.c | 4 ++-- ccan/crypto/hkdf_sha256/hkdf_sha256.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 #include -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); -- 2.39.2