diff options
author | Christian Grothoff <grothoff@gnunet.org> | 2022-03-27 15:35:14 +0200 |
---|---|---|
committer | Christian Grothoff <grothoff@gnunet.org> | 2022-03-30 10:29:16 +0200 |
commit | edf6f59fac12cd6f7d0a14ecf2a47ab82a8beb17 (patch) | |
tree | ec0aef032f86628831a8c430dcc1655e9b83b4ca /src/util/crypto_kdf.c | |
parent | 4e5747f9a58c382c3fb82de4084b08bc7b5120d6 (diff) | |
download | gnunet-edf6f59fac12cd6f7d0a14ecf2a47ab82a8beb17.tar.gz gnunet-edf6f59fac12cd6f7d0a14ecf2a47ab82a8beb17.zip |
-logging, minor memory leak fix
Diffstat (limited to 'src/util/crypto_kdf.c')
-rw-r--r-- | src/util/crypto_kdf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 0dc734549..8041f61ab 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c | |||
@@ -43,7 +43,7 @@ | |||
43 | * @param argp va_list of void * & size_t pairs for context chunks | 43 | * @param argp va_list of void * & size_t pairs for context chunks |
44 | * @return #GNUNET_YES on success | 44 | * @return #GNUNET_YES on success |
45 | */ | 45 | */ |
46 | int | 46 | enum GNUNET_GenericReturnValue |
47 | GNUNET_CRYPTO_kdf_v (void *result, | 47 | GNUNET_CRYPTO_kdf_v (void *result, |
48 | size_t out_len, | 48 | size_t out_len, |
49 | const void *xts, | 49 | const void *xts, |
@@ -62,7 +62,7 @@ GNUNET_CRYPTO_kdf_v (void *result, | |||
62 | * hash function." | 62 | * hash function." |
63 | * | 63 | * |
64 | * http://eprint.iacr.org/2010/264 | 64 | * http://eprint.iacr.org/2010/264 |
65 | */// | 65 | */ |
66 | return GNUNET_CRYPTO_hkdf_v (result, | 66 | return GNUNET_CRYPTO_hkdf_v (result, |
67 | out_len, | 67 | out_len, |
68 | GCRY_MD_SHA512, | 68 | GCRY_MD_SHA512, |
@@ -86,7 +86,7 @@ GNUNET_CRYPTO_kdf_v (void *result, | |||
86 | * @param ... void * & size_t pairs for context chunks | 86 | * @param ... void * & size_t pairs for context chunks |
87 | * @return #GNUNET_YES on success | 87 | * @return #GNUNET_YES on success |
88 | */ | 88 | */ |
89 | int | 89 | enum GNUNET_GenericReturnValue |
90 | GNUNET_CRYPTO_kdf (void *result, | 90 | GNUNET_CRYPTO_kdf (void *result, |
91 | size_t out_len, | 91 | size_t out_len, |
92 | const void *xts, | 92 | const void *xts, |
@@ -145,6 +145,7 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r, | |||
145 | uint8_t buf[ (nbits - 1) / 8 + 1 ]; | 145 | uint8_t buf[ (nbits - 1) / 8 + 1 ]; |
146 | uint16_t ctr_nbo = htons (ctr); | 146 | uint16_t ctr_nbo = htons (ctr); |
147 | 147 | ||
148 | memset (buf, 0, sizeof (buf)); | ||
148 | rc = GNUNET_CRYPTO_kdf (buf, | 149 | rc = GNUNET_CRYPTO_kdf (buf, |
149 | sizeof(buf), | 150 | sizeof(buf), |
150 | xts, xts_len, | 151 | xts, xts_len, |
@@ -160,7 +161,7 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r, | |||
160 | sizeof(buf), | 161 | sizeof(buf), |
161 | &rsize); | 162 | &rsize); |
162 | GNUNET_assert (0 == rc); /* Allocation error? */ | 163 | GNUNET_assert (0 == rc); /* Allocation error? */ |
163 | 164 | GNUNET_assert (rsize == sizeof (buf)); | |
164 | gcry_mpi_clear_highbit (*r, nbits); | 165 | gcry_mpi_clear_highbit (*r, nbits); |
165 | GNUNET_assert (0 == gcry_mpi_test_bit (*r, nbits)); | 166 | GNUNET_assert (0 == gcry_mpi_test_bit (*r, nbits)); |
166 | ++ctr; | 167 | ++ctr; |