From 47471fb14d43bf39d900d350d3eddaacabc63002 Mon Sep 17 00:00:00 2001 From: Nils Durner Date: Fri, 22 Oct 2010 21:46:02 +0000 Subject: [PATCH] minor improvements --- src/util/crypto_hkdf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c index e27f31bb8..315a192ba 100644 --- a/src/util/crypto_hkdf.c +++ b/src/util/crypto_hkdf.c @@ -161,10 +161,6 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, if (k == 0) return GNUNET_SYSERR; - // FIXME: what is the check for? - if (out_len > (2 ^ 32 * k)) - return GNUNET_SYSERR; - if (gcry_md_open(&xtr, xtr_algo, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR) return GNUNET_SYSERR; @@ -248,10 +244,9 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, if (t > 0) { memcpy (plain, result - k, k); - memset (plain + k + ctx_len, i + 1, 1); + i++; } - else - memset (plain + k + ctx_len, 1, 1); + memset (plain + k + ctx_len, i, 1); gcry_md_reset (prf); #if DEBUG_HKDF dump("K(t):d", plain, plain_len); -- 2.25.1