53cc9baeb9
clang-16 warns about casting between incompatible function types:
arch/arm/crypto/sha256_glue.c:37:5: error: cast from 'void (*)(u32 *, const void *, unsigned int)' (aka 'void (*)(unsigned int *, const void *, unsigned int)') to 'sha256_block_fn *' (aka 'void (*)(struct sha256_state *, const unsigned char *, int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
37 | (sha256_block_fn *)sha256_block_data_order);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/arm/crypto/sha512-glue.c:34:3: error: cast from 'void (*)(u64 *, const u8 *, int)' (aka 'void (*)(unsigned long long *, const unsigned char *, int)') to 'sha512_block_fn *' (aka 'void (*)(struct sha512_state *, const unsigned char *, int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
34 | (sha512_block_fn *)sha512_block_data_order);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fix the prototypes for the assembler functions to match the typedef.
The code already relies on the digest being the first part of the
state structure, so there is no change in behavior.
Fixes: c80ae7ca37 ("crypto: arm/sha512 - accelerated SHA-512 using ARM generic ASM and NEON")
Fixes: b59e2ae369 ("crypto: arm/sha256 - move SHA-224/256 ASM/NEON implementation to base layer")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
115 lines
2.9 KiB
C
115 lines
2.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* sha512-glue.c - accelerated SHA-384/512 for ARM
|
|
*
|
|
* Copyright (C) 2015 Linaro Ltd <ard.biesheuvel@linaro.org>
|
|
*/
|
|
|
|
#include <crypto/internal/hash.h>
|
|
#include <crypto/sha2.h>
|
|
#include <crypto/sha512_base.h>
|
|
#include <linux/crypto.h>
|
|
#include <linux/module.h>
|
|
|
|
#include <asm/hwcap.h>
|
|
#include <asm/neon.h>
|
|
|
|
#include "sha512.h"
|
|
|
|
MODULE_DESCRIPTION("Accelerated SHA-384/SHA-512 secure hash for ARM");
|
|
MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
|
|
MODULE_LICENSE("GPL v2");
|
|
|
|
MODULE_ALIAS_CRYPTO("sha384");
|
|
MODULE_ALIAS_CRYPTO("sha512");
|
|
MODULE_ALIAS_CRYPTO("sha384-arm");
|
|
MODULE_ALIAS_CRYPTO("sha512-arm");
|
|
|
|
asmlinkage void sha512_block_data_order(struct sha512_state *state,
|
|
u8 const *src, int blocks);
|
|
|
|
int sha512_arm_update(struct shash_desc *desc, const u8 *data,
|
|
unsigned int len)
|
|
{
|
|
return sha512_base_do_update(desc, data, len, sha512_block_data_order);
|
|
}
|
|
|
|
static int sha512_arm_final(struct shash_desc *desc, u8 *out)
|
|
{
|
|
sha512_base_do_finalize(desc, sha512_block_data_order);
|
|
return sha512_base_finish(desc, out);
|
|
}
|
|
|
|
int sha512_arm_finup(struct shash_desc *desc, const u8 *data,
|
|
unsigned int len, u8 *out)
|
|
{
|
|
sha512_base_do_update(desc, data, len, sha512_block_data_order);
|
|
return sha512_arm_final(desc, out);
|
|
}
|
|
|
|
static struct shash_alg sha512_arm_algs[] = { {
|
|
.init = sha384_base_init,
|
|
.update = sha512_arm_update,
|
|
.final = sha512_arm_final,
|
|
.finup = sha512_arm_finup,
|
|
.descsize = sizeof(struct sha512_state),
|
|
.digestsize = SHA384_DIGEST_SIZE,
|
|
.base = {
|
|
.cra_name = "sha384",
|
|
.cra_driver_name = "sha384-arm",
|
|
.cra_priority = 250,
|
|
.cra_blocksize = SHA512_BLOCK_SIZE,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
}, {
|
|
.init = sha512_base_init,
|
|
.update = sha512_arm_update,
|
|
.final = sha512_arm_final,
|
|
.finup = sha512_arm_finup,
|
|
.descsize = sizeof(struct sha512_state),
|
|
.digestsize = SHA512_DIGEST_SIZE,
|
|
.base = {
|
|
.cra_name = "sha512",
|
|
.cra_driver_name = "sha512-arm",
|
|
.cra_priority = 250,
|
|
.cra_blocksize = SHA512_BLOCK_SIZE,
|
|
.cra_module = THIS_MODULE,
|
|
}
|
|
} };
|
|
|
|
static int __init sha512_arm_mod_init(void)
|
|
{
|
|
int err;
|
|
|
|
err = crypto_register_shashes(sha512_arm_algs,
|
|
ARRAY_SIZE(sha512_arm_algs));
|
|
if (err)
|
|
return err;
|
|
|
|
if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && cpu_has_neon()) {
|
|
err = crypto_register_shashes(sha512_neon_algs,
|
|
ARRAY_SIZE(sha512_neon_algs));
|
|
if (err)
|
|
goto err_unregister;
|
|
}
|
|
return 0;
|
|
|
|
err_unregister:
|
|
crypto_unregister_shashes(sha512_arm_algs,
|
|
ARRAY_SIZE(sha512_arm_algs));
|
|
|
|
return err;
|
|
}
|
|
|
|
static void __exit sha512_arm_mod_fini(void)
|
|
{
|
|
crypto_unregister_shashes(sha512_arm_algs,
|
|
ARRAY_SIZE(sha512_arm_algs));
|
|
if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && cpu_has_neon())
|
|
crypto_unregister_shashes(sha512_neon_algs,
|
|
ARRAY_SIZE(sha512_neon_algs));
|
|
}
|
|
|
|
module_init(sha512_arm_mod_init);
|
|
module_exit(sha512_arm_mod_fini);
|