diff options
author | Nils Durner <durner@gnunet.org> | 2010-10-22 21:46:02 +0000 |
---|---|---|
committer | Nils Durner <durner@gnunet.org> | 2010-10-22 21:46:02 +0000 |
commit | 47471fb14d43bf39d900d350d3eddaacabc63002 (patch) | |
tree | 31d4a80ab79beb5d1d5d6265d0fea7ae53091e98 /src/util/crypto_hkdf.c | |
parent | 8a9e1bbdece202c9fc87320e93b4ad1c4aa1d717 (diff) | |
download | gnunet-47471fb14d43bf39d900d350d3eddaacabc63002.tar.gz gnunet-47471fb14d43bf39d900d350d3eddaacabc63002.zip |
minor improvements
Diffstat (limited to 'src/util/crypto_hkdf.c')
-rw-r--r-- | src/util/crypto_hkdf.c | 9 |
1 files 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, | |||
161 | if (k == 0) | 161 | if (k == 0) |
162 | return GNUNET_SYSERR; | 162 | return GNUNET_SYSERR; |
163 | 163 | ||
164 | // FIXME: what is the check for? | ||
165 | if (out_len > (2 ^ 32 * k)) | ||
166 | return GNUNET_SYSERR; | ||
167 | |||
168 | if (gcry_md_open(&xtr, xtr_algo, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR) | 164 | if (gcry_md_open(&xtr, xtr_algo, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR) |
169 | return GNUNET_SYSERR; | 165 | return GNUNET_SYSERR; |
170 | 166 | ||
@@ -248,10 +244,9 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, | |||
248 | if (t > 0) | 244 | if (t > 0) |
249 | { | 245 | { |
250 | memcpy (plain, result - k, k); | 246 | memcpy (plain, result - k, k); |
251 | memset (plain + k + ctx_len, i + 1, 1); | 247 | i++; |
252 | } | 248 | } |
253 | else | 249 | memset (plain + k + ctx_len, i, 1); |
254 | memset (plain + k + ctx_len, 1, 1); | ||
255 | gcry_md_reset (prf); | 250 | gcry_md_reset (prf); |
256 | #if DEBUG_HKDF | 251 | #if DEBUG_HKDF |
257 | dump("K(t):d", plain, plain_len); | 252 | dump("K(t):d", plain, plain_len); |