diff options
Diffstat (limited to 'src/util/crypto_kdf.c')
-rw-r--r-- | src/util/crypto_kdf.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index d8fcbd866..0e7fbbbec 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c | |||
@@ -44,8 +44,8 @@ | |||
44 | */ | 44 | */ |
45 | int | 45 | int |
46 | GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, | 46 | GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, |
47 | size_t xts_len, const void *skm, size_t skm_len, | 47 | size_t xts_len, const void *skm, size_t skm_len, |
48 | va_list argp) | 48 | va_list argp) |
49 | { | 49 | { |
50 | /* | 50 | /* |
51 | * "Finally, we point out to a particularly advantageous instantiation using | 51 | * "Finally, we point out to a particularly advantageous instantiation using |
@@ -59,9 +59,8 @@ GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, | |||
59 | * http://eprint.iacr.org/2010/264 | 59 | * http://eprint.iacr.org/2010/264 |
60 | */ | 60 | */ |
61 | 61 | ||
62 | return GNUNET_CRYPTO_hkdf_v (result, out_len, GCRY_MD_SHA512, | 62 | return GNUNET_CRYPTO_hkdf_v (result, out_len, GCRY_MD_SHA512, GCRY_MD_SHA256, |
63 | GCRY_MD_SHA256, xts, xts_len, skm, skm_len, | 63 | xts, xts_len, skm, skm_len, argp); |
64 | argp); | ||
65 | } | 64 | } |
66 | 65 | ||
67 | /** | 66 | /** |
@@ -77,14 +76,13 @@ GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, | |||
77 | */ | 76 | */ |
78 | int | 77 | int |
79 | GNUNET_CRYPTO_kdf (void *result, size_t out_len, const void *xts, | 78 | GNUNET_CRYPTO_kdf (void *result, size_t out_len, const void *xts, |
80 | size_t xts_len, const void *skm, size_t skm_len, ...) | 79 | size_t xts_len, const void *skm, size_t skm_len, ...) |
81 | { | 80 | { |
82 | va_list argp; | 81 | va_list argp; |
83 | int ret; | 82 | int ret; |
84 | 83 | ||
85 | va_start (argp, skm_len); | 84 | va_start (argp, skm_len); |
86 | ret = | 85 | ret = GNUNET_CRYPTO_kdf_v (result, out_len, xts, xts_len, skm, skm_len, argp); |
87 | GNUNET_CRYPTO_kdf_v (result, out_len, xts, xts_len, skm, skm_len, argp); | ||
88 | va_end (argp); | 86 | va_end (argp); |
89 | 87 | ||
90 | return ret; | 88 | return ret; |