diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-10-07 20:07:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-10-07 20:07:05 +0000 |
commit | b6bc596b82586c695507ce1ac48d7a10ce289ca6 (patch) | |
tree | 965986116c7f93adf647a1bfbd58520671646bf4 /src/util/crypto_hkdf.c | |
parent | 0ff0854fcadc3c84f5f5125610306fadcf202649 (diff) | |
download | gnunet-b6bc596b82586c695507ce1ac48d7a10ce289ca6.tar.gz gnunet-b6bc596b82586c695507ce1ac48d7a10ce289ca6.zip |
small fixes and style issues
Diffstat (limited to 'src/util/crypto_hkdf.c')
-rw-r--r-- | src/util/crypto_hkdf.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c index 64437571e..c436e9962 100644 --- a/src/util/crypto_hkdf.c +++ b/src/util/crypto_hkdf.c | |||
@@ -43,7 +43,7 @@ | |||
43 | * @param buf_len length of buf | 43 | * @param buf_len length of buf |
44 | * @return HMAC, freed by caller via gcry_md_close/_reset | 44 | * @return HMAC, freed by caller via gcry_md_close/_reset |
45 | */ | 45 | */ |
46 | static void * | 46 | static const void * |
47 | doHMAC (gcry_md_hd_t mac, | 47 | doHMAC (gcry_md_hd_t mac, |
48 | const void *key, size_t key_len, | 48 | const void *key, size_t key_len, |
49 | const void *buf, size_t buf_len) | 49 | const void *buf, size_t buf_len) |
@@ -51,7 +51,7 @@ doHMAC (gcry_md_hd_t mac, | |||
51 | gcry_md_setkey (mac, key, key_len); | 51 | gcry_md_setkey (mac, key, key_len); |
52 | gcry_md_write (mac, buf, buf_len); | 52 | gcry_md_write (mac, buf, buf_len); |
53 | 53 | ||
54 | return (void *) gcry_md_read (mac, 0); | 54 | return (const void *) gcry_md_read (mac, 0); |
55 | } | 55 | } |
56 | 56 | ||
57 | /** | 57 | /** |
@@ -70,12 +70,14 @@ getPRK (gcry_md_hd_t mac, | |||
70 | const void *skm, unsigned long long skm_len, | 70 | const void *skm, unsigned long long skm_len, |
71 | void *prk) | 71 | void *prk) |
72 | { | 72 | { |
73 | void *ret; | 73 | const void *ret; |
74 | 74 | ||
75 | ret = doHMAC (mac, xts, xts_len, skm, skm_len); | 75 | ret = doHMAC (mac, xts, xts_len, skm, skm_len); |
76 | if (ret == NULL) | 76 | if (ret == NULL) |
77 | return GNUNET_SYSERR; | 77 | return GNUNET_SYSERR; |
78 | memcpy (prk, ret, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))); | 78 | memcpy (prk, |
79 | ret, | ||
80 | gcry_md_get_algo_dlen (gcry_md_get_algo (mac))); | ||
79 | 81 | ||
80 | return GNUNET_YES; | 82 | return GNUNET_YES; |
81 | } | 83 | } |
@@ -119,7 +121,8 @@ GNUNET_CRYPTO_hkdf_v (void *result, unsigned long long out_len, | |||
119 | const void *skm, size_t skm_len, | 121 | const void *skm, size_t skm_len, |
120 | va_list argp) | 122 | va_list argp) |
121 | { | 123 | { |
122 | void *prk, *hc, *plain; | 124 | void *prk, *plain; |
125 | const void *hc; | ||
123 | unsigned long long plain_len; | 126 | unsigned long long plain_len; |
124 | unsigned long i, t, d; | 127 | unsigned long i, t, d; |
125 | unsigned int k, xtr_len; | 128 | unsigned int k, xtr_len; |
@@ -180,7 +183,9 @@ GNUNET_CRYPTO_hkdf_v (void *result, unsigned long long out_len, | |||
180 | #if DEBUG_HKDF | 183 | #if DEBUG_HKDF |
181 | dump("K(1)", plain, plain_len); | 184 | dump("K(1)", plain, plain_len); |
182 | #endif | 185 | #endif |
183 | hc = doHMAC (prf, prk, xtr_len, plain, ctx_len + 1); | 186 | hc = doHMAC (prf, |
187 | prk, | ||
188 | xtr_len, plain, ctx_len + 1); | ||
184 | if (hc == NULL) | 189 | if (hc == NULL) |
185 | goto hkdf_error; | 190 | goto hkdf_error; |
186 | memcpy (result, hc, k); | 191 | memcpy (result, hc, k); |