diff options
Diffstat (limited to 'src/util/crypto_hkdf.c')
-rw-r--r-- | src/util/crypto_hkdf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c index fa2bd1a69..c6c43f800 100644 --- a/src/util/crypto_hkdf.c +++ b/src/util/crypto_hkdf.c | |||
@@ -102,7 +102,7 @@ getPRK (gcry_md_hd_t mac, const void *xts, size_t xts_len, const void *skm, | |||
102 | ret = doHMAC (mac, xts, xts_len, skm, skm_len); | 102 | ret = doHMAC (mac, xts, xts_len, skm, skm_len); |
103 | if (ret == NULL) | 103 | if (ret == NULL) |
104 | return GNUNET_SYSERR; | 104 | return GNUNET_SYSERR; |
105 | memcpy (prk, ret, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))); | 105 | GNUNET_memcpy (prk, ret, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))); |
106 | 106 | ||
107 | return GNUNET_YES; | 107 | return GNUNET_YES; |
108 | } | 108 | } |
@@ -198,7 +198,7 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, int xtr_algo, int prf_algo, | |||
198 | size_t len; | 198 | size_t len; |
199 | 199 | ||
200 | len = va_arg (args, size_t); | 200 | len = va_arg (args, size_t); |
201 | memcpy (dst, ctx, len); | 201 | GNUNET_memcpy (dst, ctx, len); |
202 | dst += len; | 202 | dst += len; |
203 | } | 203 | } |
204 | va_end (args); | 204 | va_end (args); |
@@ -212,14 +212,14 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, int xtr_algo, int prf_algo, | |||
212 | hc = doHMAC (prf, prk, xtr_len, &plain[k], ctx_len + 1); | 212 | hc = doHMAC (prf, prk, xtr_len, &plain[k], ctx_len + 1); |
213 | if (hc == NULL) | 213 | if (hc == NULL) |
214 | goto hkdf_error; | 214 | goto hkdf_error; |
215 | memcpy (result, hc, k); | 215 | GNUNET_memcpy (result, hc, k); |
216 | result += k; | 216 | result += k; |
217 | } | 217 | } |
218 | 218 | ||
219 | /* K(i+1) */ | 219 | /* K(i+1) */ |
220 | for (i = 1; i < t; i++) | 220 | for (i = 1; i < t; i++) |
221 | { | 221 | { |
222 | memcpy (plain, result - k, k); | 222 | GNUNET_memcpy (plain, result - k, k); |
223 | memset (plain + k + ctx_len, i + 1, 1); | 223 | memset (plain + k + ctx_len, i + 1, 1); |
224 | gcry_md_reset (prf); | 224 | gcry_md_reset (prf); |
225 | #if DEBUG_HKDF | 225 | #if DEBUG_HKDF |
@@ -228,7 +228,7 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, int xtr_algo, int prf_algo, | |||
228 | hc = doHMAC (prf, prk, xtr_len, plain, plain_len); | 228 | hc = doHMAC (prf, prk, xtr_len, plain, plain_len); |
229 | if (hc == NULL) | 229 | if (hc == NULL) |
230 | goto hkdf_error; | 230 | goto hkdf_error; |
231 | memcpy (result, hc, k); | 231 | GNUNET_memcpy (result, hc, k); |
232 | result += k; | 232 | result += k; |
233 | } | 233 | } |
234 | 234 | ||
@@ -237,7 +237,7 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, int xtr_algo, int prf_algo, | |||
237 | { | 237 | { |
238 | if (t > 0) | 238 | if (t > 0) |
239 | { | 239 | { |
240 | memcpy (plain, result - k, k); | 240 | GNUNET_memcpy (plain, result - k, k); |
241 | i++; | 241 | i++; |
242 | } | 242 | } |
243 | memset (plain + k + ctx_len, i, 1); | 243 | memset (plain + k + ctx_len, i, 1); |
@@ -251,7 +251,7 @@ GNUNET_CRYPTO_hkdf_v (void *result, size_t out_len, int xtr_algo, int prf_algo, | |||
251 | hc = doHMAC (prf, prk, xtr_len, plain + k, plain_len - k); | 251 | hc = doHMAC (prf, prk, xtr_len, plain + k, plain_len - k); |
252 | if (hc == NULL) | 252 | if (hc == NULL) |
253 | goto hkdf_error; | 253 | goto hkdf_error; |
254 | memcpy (result, hc, d); | 254 | GNUNET_memcpy (result, hc, d); |
255 | } | 255 | } |
256 | #if DEBUG_HKDF | 256 | #if DEBUG_HKDF |
257 | dump ("result", result - k, out_len); | 257 | dump ("result", result - k, out_len); |