RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: allow sha1 algorithm

This commit is contained in:
Thomas Schoebel-Theuer 2019-03-26 14:22:08 +01:00 committed by Thomas Schoebel-Theuer
parent 3812467c32
commit 6f3f46249e
4 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/Kconfig
View File

@ -10,6 +10,7 @@ config MARS
select CRYPTO_MD5
select CRYPTO_CRC32
select CRYPTO_CRC32C
select CRYPTO_SHA1
---help---
See https://github.com/schoebel/mars/docu/
Only compile as a module!

4
kernel/compat.h
View File

@ -225,4 +225,8 @@ extern int _compat_unlink(
#define HAS_CRC32
#endif
#if defined(CONFIG_CRYPTO_SHA1) || defined(CONFIG_CRYPTO_SHA1_MODULE)
#define HAS_SHA1
#endif
#endif /* _MARS_COMPAT */

3
kernel/mars.h
View File

@ -165,6 +165,7 @@ enum _MREF_FLAGS {
_MREF_CHKSUM_MD5,
_MREF_CHKSUM_CRC32C,
_MREF_CHKSUM_CRC32,
_MREF_CHKSUM_SHA1,
_MREF_CHKSUM_LAST,
};
@ -179,11 +180,13 @@ enum _MREF_FLAGS {
#define MREF_CHKSUM_MD5 (1UL << _MREF_CHKSUM_MD5)
#define MREF_CHKSUM_CRC32C (1UL << _MREF_CHKSUM_CRC32C)
#define MREF_CHKSUM_CRC32 (1UL << _MREF_CHKSUM_CRC32)
#define MREF_CHKSUM_SHA1 (1UL << _MREF_CHKSUM_SHA1)
#define MREF_CHKSUM_LAST (1UL << _MREF_CHKSUM_LAST)
#define MREF_CHKSUM_ANY (MREF_CHKSUM_MD5_OLD | \
MREF_CHKSUM_MD5 | \
MREF_CHKSUM_CRC32C | \
MREF_CHKSUM_CRC32 | \
MREF_CHKSUM_SHA1 | \
MREF_CHKSUM_LAST)
#define MREF_OBJECT(OBJTYPE) \

65
kernel/mars_generic.c
View File

@ -169,6 +169,11 @@ static struct crypto_shash *crc32c_tfm = NULL;
static struct crypto_shash *crc32_tfm = NULL;
#endif
#ifdef HAS_SHA1
#define SHA1_DIGEST_SIZE 20
static struct crypto_shash *sha1_tfm = NULL;
#endif
struct mars_sdesc {
struct shash_desc shash;
char ctx[];
@ -333,6 +338,34 @@ void crc32_digest(void *digest, void *data, int len)
}
#endif
#ifdef HAS_SHA1
static
void sha1_digest(void *digest, void *data, int len)
{
int size = sizeof(struct mars_sdesc) + crypto_shash_descsize(sha1_tfm);
struct mars_sdesc *sdesc = brick_mem_alloc(size);
unsigned char tmp[SHA1_DIGEST_SIZE] = {};
int status;
sdesc->shash.tfm = sha1_tfm;
sdesc->shash.flags = 0;
status = crypto_shash_digest(&sdesc->shash, data, len, tmp);
if (unlikely(status < 0)) {
MARS_ERR("cannot calculate sha1 chksum on %p len=%d, status=%d\n",
data, len,
status);
memset(digest, 0, MARS_DIGEST_SIZE);
} else {
memcpy(digest, tmp, SHA1_DIGEST_SIZE);
memset(digest + SHA1_DIGEST_SIZE, 0,
MARS_DIGEST_SIZE - SHA1_DIGEST_SIZE);
}
brick_mem_free(sdesc);
}
#endif
__u32 mars_digest(__u32 digest_flags,
__u32 *used_flags,
void *digest,
@ -364,6 +397,14 @@ __u32 mars_digest(__u32 digest_flags,
*used_flags = MREF_CHKSUM_MD5;
return MREF_CHKSUM_MD5;
}
#ifdef HAS_SHA1
if (digest_flags & MREF_CHKSUM_SHA1 && sha1_tfm) {
sha1_digest(digest, data, len);
if (used_flags)
*used_flags = MREF_CHKSUM_SHA1;
return MREF_CHKSUM_SHA1;
}
#endif
/* always fallback to old md5 regardless of digest_flags */
md5_old_digest(digest, data, len);
@ -470,12 +511,31 @@ int init_mars_digest(void)
}
#endif
#ifdef HAS_SHA1
sha1_tfm = crypto_alloc_shash("sha1", 0, 0);
if (unlikely(!sha1_tfm) || IS_ERR(sha1_tfm)) {
MARS_ERR("cannot alloc crypto hash, status=%ld\n",
PTR_ERR(sha1_tfm));
sha1_tfm = NULL;
} else {
status = crypto_shash_digestsize(sha1_tfm);
if (unlikely(status != SHA1_DIGEST_SIZE)) {
MARS_ERR("sha1 bad digest size %d\n", status);
return -ELIBACC;
}
available_digest_mask |= MREF_CHKSUM_SHA1;
}
#endif
#ifdef CONFIG_MARS_BENCHMARK
#ifdef HAS_CRC32C
benchmark_digest("crc32c", MREF_CHKSUM_CRC32C);
#endif
#ifdef HAS_CRC32
benchmark_digest("crc32", MREF_CHKSUM_CRC32);
#endif
#ifdef HAS_SHA1
benchmark_digest("sha1", MREF_CHKSUM_SHA1);
#endif
benchmark_digest("md5old", MREF_CHKSUM_MD5_OLD);
benchmark_digest("md5", MREF_CHKSUM_MD5);
@ -499,6 +559,11 @@ void exit_mars_digest(void)
crypto_free_shash(crc32_tfm);
}
#endif
#ifdef HAS_SHA1
if (sha1_tfm) {
crypto_free_shash(sha1_tfm);
}
#endif
}
#else /* MARS_HAS_NEW_CRYPTO */