diff options
author | ng0 <ng0@n0.is> | 2019-11-27 18:01:12 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-11-27 18:01:12 +0000 |
commit | 3ad52c948d69799351c4a98cd04294d470c49e66 (patch) | |
tree | 03c5ece9cbc5cafee21005f9a9a2148fd92943e7 /src/util/crypto_kdf.c | |
parent | e5e6aecd0edaf03472833c34fbca057d0aabdfd7 (diff) | |
parent | bb5def7be01569fe49b074e76e40cc5a7467c925 (diff) | |
download | gnunet-3ad52c948d69799351c4a98cd04294d470c49e66.tar.gz gnunet-3ad52c948d69799351c4a98cd04294d470c49e66.zip |
Merge branch 'master' of gnunet.org:gnunet
Diffstat (limited to 'src/util/crypto_kdf.c')
-rw-r--r-- | src/util/crypto_kdf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 43a9731ff..1b3bd686f 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c | |||
@@ -132,7 +132,7 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r, | |||
132 | gcry_error_t rc; | 132 | gcry_error_t rc; |
133 | unsigned int nbits; | 133 | unsigned int nbits; |
134 | size_t rsize; | 134 | size_t rsize; |
135 | unsigned int ctr; | 135 | uint16_t ctr; |
136 | 136 | ||
137 | nbits = gcry_mpi_get_nbits (n); | 137 | nbits = gcry_mpi_get_nbits (n); |
138 | /* GNUNET_assert (nbits > 512); */ | 138 | /* GNUNET_assert (nbits > 512); */ |
@@ -143,12 +143,14 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r, | |||
143 | /* Ain't clear if n is always divisible by 8 */ | 143 | /* Ain't clear if n is always divisible by 8 */ |
144 | uint8_t buf[ (nbits - 1) / 8 + 1 ]; | 144 | uint8_t buf[ (nbits - 1) / 8 + 1 ]; |
145 | 145 | ||
146 | uint16_t ctr_nbo = htons (ctr); | ||
147 | |||
146 | rc = GNUNET_CRYPTO_kdf (buf, | 148 | rc = GNUNET_CRYPTO_kdf (buf, |
147 | sizeof(buf), | 149 | sizeof(buf), |
148 | xts, xts_len, | 150 | xts, xts_len, |
149 | skm, skm_len, | 151 | skm, skm_len, |
150 | ctx, strlen (ctx), | 152 | ctx, strlen (ctx), |
151 | &ctr, sizeof(ctr), | 153 | &ctr_nbo, sizeof(ctr_nbo), |
152 | NULL, 0); | 154 | NULL, 0); |
153 | GNUNET_assert (GNUNET_YES == rc); | 155 | GNUNET_assert (GNUNET_YES == rc); |
154 | 156 | ||