Commit 2d16803c authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Herbert Xu
Browse files

crypto: blake2s - remove shash module 



BLAKE2s has no currently known use as an shash. Just remove all of this
unnecessary plumbing. Removing this shash was something we talked about
back when we were making BLAKE2s a built-in, but I simply never got
around to doing it. So this completes that project.

Importantly, this fixs a bug in which the lib code depends on
crypto_simd_disabled_for_test, causing linker errors.

Also add more alignment tests to the selftests and compare SIMD and
non-SIMD compression functions, to make up for what we lose from
testmgr.c.

Reported-by: default avatargaochao <gaochao49@huawei.com>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: stable@vger.kernel.org
Fixes: 6048fdcc ("lib/crypto: blake2s: include as built-in")
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 920b0442

arch/arm/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ config CRYPTO_SHA512_ARM 
	  using optimized ARM assembler and NEON, when available.



config CRYPTO_BLAKE2S_ARM

	tristate "BLAKE2s digest algorithm (ARM)"

	bool "BLAKE2s digest algorithm (ARM)"

	select CRYPTO_ARCH_HAVE_LIB_BLAKE2S

	help

	  BLAKE2s digest algorithm optimized with ARM scalar instructions.  This

arch/arm/crypto/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o 
obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o

obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o

obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o

obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += blake2s-arm.o

obj-$(if $(CONFIG_CRYPTO_BLAKE2S_ARM),y) += libblake2s-arm.o

obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += libblake2s-arm.o

obj-$(CONFIG_CRYPTO_BLAKE2B_NEON) += blake2b-neon.o

obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o

obj-$(CONFIG_CRYPTO_POLY1305_ARM) += poly1305-arm.o
@@ -32,7 +31,6 @@ sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o 
sha256-arm-y	:= sha256-core.o sha256_glue.o $(sha256-arm-neon-y)

sha512-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha512-neon-glue.o

sha512-arm-y	:= sha512-core.o sha512-glue.o $(sha512-arm-neon-y)

blake2s-arm-y   := blake2s-shash.o

libblake2s-arm-y:= blake2s-core.o blake2s-glue.o

blake2b-neon-y  := blake2b-neon-core.o blake2b-neon-glue.o

sha1-arm-ce-y	:= sha1-ce-core.o sha1-ce-glue.o

arch/arm/crypto/blake2s-shash.c

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * BLAKE2s digest algorithm, ARM scalar implementation

 *

 * Copyright 2020 Google LLC

 */



#include <crypto/internal/blake2s.h>

#include <crypto/internal/hash.h>



#include <linux/module.h>



static int crypto_blake2s_update_arm(struct shash_desc *desc,

				     const u8 *in, unsigned int inlen)

{

	return crypto_blake2s_update(desc, in, inlen, false);

}



static int crypto_blake2s_final_arm(struct shash_desc *desc, u8 *out)

{

	return crypto_blake2s_final(desc, out, false);

}



#define BLAKE2S_ALG(name, driver_name, digest_size)			\

	{								\

		.base.cra_name		= name,				\

		.base.cra_driver_name	= driver_name,			\

		.base.cra_priority	= 200,				\

		.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,	\

		.base.cra_blocksize	= BLAKE2S_BLOCK_SIZE,		\

		.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx), \

		.base.cra_module	= THIS_MODULE,			\

		.digestsize		= digest_size,			\

		.setkey			= crypto_blake2s_setkey,	\

		.init			= crypto_blake2s_init,		\

		.update			= crypto_blake2s_update_arm,	\

		.final			= crypto_blake2s_final_arm,	\

		.descsize		= sizeof(struct blake2s_state),	\

	}



static struct shash_alg blake2s_arm_algs[] = {

	BLAKE2S_ALG("blake2s-128", "blake2s-128-arm", BLAKE2S_128_HASH_SIZE),

	BLAKE2S_ALG("blake2s-160", "blake2s-160-arm", BLAKE2S_160_HASH_SIZE),

	BLAKE2S_ALG("blake2s-224", "blake2s-224-arm", BLAKE2S_224_HASH_SIZE),

	BLAKE2S_ALG("blake2s-256", "blake2s-256-arm", BLAKE2S_256_HASH_SIZE),

};



static int __init blake2s_arm_mod_init(void)

{

	return IS_REACHABLE(CONFIG_CRYPTO_HASH) ?

		crypto_register_shashes(blake2s_arm_algs,

					ARRAY_SIZE(blake2s_arm_algs)) : 0;

}



static void __exit blake2s_arm_mod_exit(void)

{

	if (IS_REACHABLE(CONFIG_CRYPTO_HASH))

		crypto_unregister_shashes(blake2s_arm_algs,

					  ARRAY_SIZE(blake2s_arm_algs));

}



module_init(blake2s_arm_mod_init);

module_exit(blake2s_arm_mod_exit);



MODULE_DESCRIPTION("BLAKE2s digest algorithm, ARM scalar implementation");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Eric Biggers <ebiggers@google.com>");

MODULE_ALIAS_CRYPTO("blake2s-128");

MODULE_ALIAS_CRYPTO("blake2s-128-arm");

MODULE_ALIAS_CRYPTO("blake2s-160");

MODULE_ALIAS_CRYPTO("blake2s-160-arm");

MODULE_ALIAS_CRYPTO("blake2s-224");

MODULE_ALIAS_CRYPTO("blake2s-224-arm");

MODULE_ALIAS_CRYPTO("blake2s-256");

MODULE_ALIAS_CRYPTO("blake2s-256-arm");

arch/x86/crypto/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ sha256-ssse3-$(CONFIG_AS_SHA256_NI) += sha256_ni_asm.o 
obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o

sha512-ssse3-y := sha512-ssse3-asm.o sha512-avx-asm.o sha512-avx2-asm.o sha512_ssse3_glue.o



obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += blake2s-x86_64.o

blake2s-x86_64-y := blake2s-shash.o

obj-$(if $(CONFIG_CRYPTO_BLAKE2S_X86),y) += libblake2s-x86_64.o

obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += libblake2s-x86_64.o

libblake2s-x86_64-y := blake2s-core.o blake2s-glue.o



obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o

arch/x86/crypto/blake2s-glue.c

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */



#include <crypto/internal/blake2s.h>

#include <crypto/internal/simd.h>



#include <linux/types.h>

#include <linux/jump_label.h>
@@ -33,7 +32,7 @@ void blake2s_compress(struct blake2s_state *state, const u8 *block, 
	/* SIMD disables preemption, so relax after processing each page. */

	BUILD_BUG_ON(SZ_4K / BLAKE2S_BLOCK_SIZE < 8);



	if (!static_branch_likely(&blake2s_use_ssse3) || !crypto_simd_usable()) {

	if (!static_branch_likely(&blake2s_use_ssse3) || !may_use_simd()) {

		blake2s_compress_generic(state, block, nblocks, inc);

		return;

	}