RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-01-26 17:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: fix digest iterations

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2022-02-28 07:28:00 +01:00
parent 36fa3858a2
commit dca0671476
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/mars_generic.c
View File

@ -185,6 +185,14 @@ struct mars_sdesc {
char ctx[];
};
#define _GET_ITERATIONS(digest_size) \
(MARS_DIGEST_SIZE / (digest_size))
#define GET_ITERATIONS(digest_size) \
(!(MARS_DIGEST_SIZE % (digest_size)) ? \
_GET_ITERATIONS(digest_size) : \
_GET_ITERATIONS(digest_size) + 1)
/* Note:
* For compatibility to OLD_MARS_DIGEST_SIZE, the higher
* digest bytes up to MARS_DIGEST_SIZE are not exploited
@ -219,7 +227,7 @@ void md5_digest(void *digest, const void *data, int len)
{
int size = sizeof(struct mars_sdesc) + crypto_shash_descsize(md5_tfm);
struct mars_sdesc *sdesc = brick_mem_alloc(size);
const int iterations = MARS_DIGEST_SIZE / MD5_DIGEST_SIZE;
const int iterations = GET_ITERATIONS(MD5_DIGEST_SIZE);
int chunksize = len / iterations;
int offset = 0;
int done_len = len;
@ -265,7 +273,7 @@ void crc32c_digest(void *digest, const void *data, int len)
{
int size = sizeof(struct mars_sdesc) + crypto_shash_descsize(crc32c_tfm);
struct mars_sdesc *sdesc = brick_mem_alloc(size);
const int iterations = MARS_DIGEST_SIZE / CRC32C_DIGEST_SIZE;
const int iterations = GET_ITERATIONS(CRC32C_DIGEST_SIZE);
int chunksize = len / iterations;
int offset = 0;
int done_len = len;
@ -311,7 +319,7 @@ void crc32_digest(void *digest, const void *data, int len)
{
int size = sizeof(struct mars_sdesc) + crypto_shash_descsize(crc32_tfm);
struct mars_sdesc *sdesc = brick_mem_alloc(size);
const int iterations = MARS_DIGEST_SIZE / CRC32_DIGEST_SIZE;
const int iterations = GET_ITERATIONS(CRC32_DIGEST_SIZE);
int chunksize = len / iterations;
int offset = 0;
int done_len = len;