674f368a95
The CRYPTO_TFM_RES_BAD_KEY_LEN flag was apparently meant as a way to make the ->setkey() functions provide more information about errors. However, no one actually checks for this flag, which makes it pointless. Also, many algorithms fail to set this flag when given a bad length key. Reviewing just the generic implementations, this is the case for aes-fixed-time, cbcmac, echainiv, nhpoly1305, pcrypt, rfc3686, rfc4309, rfc7539, rfc7539esp, salsa20, seqiv, and xcbc. But there are probably many more in arch/*/crypto/ and drivers/crypto/. Some algorithms can even set this flag when the key is the correct length. For example, authenc and authencesn set it when the key payload is malformed in any way (not just a bad length), the atmel-sha and ccree drivers can set it if a memory allocation fails, and the chelsio driver sets it for bad auth tag lengths, not just bad key lengths. So even if someone actually wanted to start checking this flag (which seems unlikely, since it's been unused for a long time), there would be a lot of work needed to get it working correctly. But it would probably be much better to go back to the drawing board and just define different return values, like -EINVAL if the key is invalid for the algorithm vs. -EKEYREJECTED if the key was rejected by a policy like "no weak keys". That would be much simpler, less error-prone, and easier to test. So just remove this flag. Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
107 lines
2.4 KiB
C
107 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <crypto/internal/hash.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/xxhash.h>
|
|
#include <asm/unaligned.h>
|
|
|
|
#define XXHASH64_BLOCK_SIZE 32
|
|
#define XXHASH64_DIGEST_SIZE 8
|
|
|
|
struct xxhash64_tfm_ctx {
|
|
u64 seed;
|
|
};
|
|
|
|
struct xxhash64_desc_ctx {
|
|
struct xxh64_state xxhstate;
|
|
};
|
|
|
|
static int xxhash64_setkey(struct crypto_shash *tfm, const u8 *key,
|
|
unsigned int keylen)
|
|
{
|
|
struct xxhash64_tfm_ctx *tctx = crypto_shash_ctx(tfm);
|
|
|
|
if (keylen != sizeof(tctx->seed))
|
|
return -EINVAL;
|
|
tctx->seed = get_unaligned_le64(key);
|
|
return 0;
|
|
}
|
|
|
|
static int xxhash64_init(struct shash_desc *desc)
|
|
{
|
|
struct xxhash64_tfm_ctx *tctx = crypto_shash_ctx(desc->tfm);
|
|
struct xxhash64_desc_ctx *dctx = shash_desc_ctx(desc);
|
|
|
|
xxh64_reset(&dctx->xxhstate, tctx->seed);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int xxhash64_update(struct shash_desc *desc, const u8 *data,
|
|
unsigned int length)
|
|
{
|
|
struct xxhash64_desc_ctx *dctx = shash_desc_ctx(desc);
|
|
|
|
xxh64_update(&dctx->xxhstate, data, length);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int xxhash64_final(struct shash_desc *desc, u8 *out)
|
|
{
|
|
struct xxhash64_desc_ctx *dctx = shash_desc_ctx(desc);
|
|
|
|
put_unaligned_le64(xxh64_digest(&dctx->xxhstate), out);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int xxhash64_digest(struct shash_desc *desc, const u8 *data,
|
|
unsigned int length, u8 *out)
|
|
{
|
|
struct xxhash64_tfm_ctx *tctx = crypto_shash_ctx(desc->tfm);
|
|
|
|
put_unaligned_le64(xxh64(data, length, tctx->seed), out);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct shash_alg alg = {
|
|
.digestsize = XXHASH64_DIGEST_SIZE,
|
|
.setkey = xxhash64_setkey,
|
|
.init = xxhash64_init,
|
|
.update = xxhash64_update,
|
|
.final = xxhash64_final,
|
|
.digest = xxhash64_digest,
|
|
.descsize = sizeof(struct xxhash64_desc_ctx),
|
|
.base = {
|
|
.cra_name = "xxhash64",
|
|
.cra_driver_name = "xxhash64-generic",
|
|
.cra_priority = 100,
|
|
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
|
|
.cra_blocksize = XXHASH64_BLOCK_SIZE,
|
|
.cra_ctxsize = sizeof(struct xxhash64_tfm_ctx),
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
};
|
|
|
|
static int __init xxhash_mod_init(void)
|
|
{
|
|
return crypto_register_shash(&alg);
|
|
}
|
|
|
|
static void __exit xxhash_mod_fini(void)
|
|
{
|
|
crypto_unregister_shash(&alg);
|
|
}
|
|
|
|
subsys_initcall(xxhash_mod_init);
|
|
module_exit(xxhash_mod_fini);
|
|
|
|
MODULE_AUTHOR("Nikolay Borisov <nborisov@suse.com>");
|
|
MODULE_DESCRIPTION("xxhash calculations wrapper for lib/xxhash.c");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS_CRYPTO("xxhash64");
|
|
MODULE_ALIAS_CRYPTO("xxhash64-generic");
|