aboutsummaryrefslogtreecommitdiff
path: root/src/util/crypto_kdf.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-11-04 14:00:32 +0000
committerChristian Grothoff <christian@grothoff.org>2011-11-04 14:00:32 +0000
commit83b19539f4d322b43683f5838b72e9ec2c8e6073 (patch)
treed0ab9329fcbefe360d9d14e2ace21a6b3396dfe9 /src/util/crypto_kdf.c
parent28a2eb43281a1f08a67954f07beb9af3a9bc9a35 (diff)
downloadgnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.tar.gz
gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.zip
curly wars / auto-indentation
Diffstat (limited to 'src/util/crypto_kdf.c')
-rw-r--r--src/util/crypto_kdf.c14
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 */
45int 45int
46GNUNET_CRYPTO_kdf_v (void *result, size_t out_len, const void *xts, 46GNUNET_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 */
78int 77int
79GNUNET_CRYPTO_kdf (void *result, size_t out_len, const void *xts, 78GNUNET_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;