From 04db860fbd8bbbfbcbb9043e673a2541f1734886 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Nov 2019 12:42:36 +0100 Subject: kdf_mpi: be explicit about ctr size --- src/util/crypto_kdf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/crypto_kdf.c') diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 43a9731ff..92b2cf5c2 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, gcry_error_t rc; unsigned int nbits; size_t rsize; - unsigned int ctr; + uint32_t ctr; nbits = gcry_mpi_get_nbits (n); /* GNUNET_assert (nbits > 512); */ -- cgit v1.2.3 From bb5def7be01569fe49b074e76e40cc5a7467c925 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Nov 2019 12:47:44 +0100 Subject: kdf_mod_mpi: fix size and use nbo --- src/util/crypto_kdf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/util/crypto_kdf.c') diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 92b2cf5c2..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, gcry_error_t rc; unsigned int nbits; size_t rsize; - uint32_t ctr; + uint16_t ctr; nbits = gcry_mpi_get_nbits (n); /* GNUNET_assert (nbits > 512); */ @@ -143,12 +143,14 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r, /* Ain't clear if n is always divisible by 8 */ uint8_t buf[ (nbits - 1) / 8 + 1 ]; + uint16_t ctr_nbo = htons (ctr); + rc = GNUNET_CRYPTO_kdf (buf, sizeof(buf), xts, xts_len, skm, skm_len, ctx, strlen (ctx), - &ctr, sizeof(ctr), + &ctr_nbo, sizeof(ctr_nbo), NULL, 0); GNUNET_assert (GNUNET_YES == rc); -- cgit v1.2.3