Commit 699618d4 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: sparc/sha256 - implement library instead of shash 



Instead of providing crypto_shash algorithms for the arch-optimized
SHA-256 code, instead implement the SHA-256 library.  This is much
simpler, it makes the SHA-256 library functions be arch-optimized, and
it fixes the longstanding issue where the arch-optimized SHA-256 was
disabled by default.  SHA-256 still remains available through
crypto_shash, but individual architectures no longer need to handle it.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 77735920

arch/sparc/crypto/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -36,16 +36,6 @@ config CRYPTO_SHA1_SPARC64 


	  Architecture: sparc64



config CRYPTO_SHA256_SPARC64

	tristate "Hash functions: SHA-224 and SHA-256"

	depends on SPARC64

	select CRYPTO_SHA256

	select CRYPTO_HASH

	help

	  SHA-224 and SHA-256 secure hash algorithms (FIPS 180)



	  Architecture: sparc64 using crypto instructions, when available



config CRYPTO_SHA512_SPARC64

	tristate "Hash functions: SHA-384 and SHA-512"

	depends on SPARC64

arch/sparc/crypto/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#



obj-$(CONFIG_CRYPTO_SHA1_SPARC64) += sha1-sparc64.o

obj-$(CONFIG_CRYPTO_SHA256_SPARC64) += sha256-sparc64.o

obj-$(CONFIG_CRYPTO_SHA512_SPARC64) += sha512-sparc64.o

obj-$(CONFIG_CRYPTO_MD5_SPARC64) += md5-sparc64.o
@@ -13,7 +12,6 @@ obj-$(CONFIG_CRYPTO_DES_SPARC64) += des-sparc64.o 
obj-$(CONFIG_CRYPTO_CAMELLIA_SPARC64) += camellia-sparc64.o



sha1-sparc64-y := sha1_asm.o sha1_glue.o

sha256-sparc64-y := sha256_asm.o sha256_glue.o

sha512-sparc64-y := sha512_asm.o sha512_glue.o

md5-sparc64-y := md5_asm.o md5_glue.o

arch/sparc/crypto/sha256_glue.c

deleted100644 → 0
+0 −128
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Glue code for SHA256 hashing optimized for sparc64 crypto opcodes.

 *

 * This is based largely upon crypto/sha256_generic.c

 *

 * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>

 * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>

 * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>

 * SHA224 Support Copyright 2007 Intel Corporation <jonathan.lynch@intel.com>

 */



#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt



#include <asm/elf.h>

#include <asm/opcodes.h>

#include <asm/pstate.h>

#include <crypto/internal/hash.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>

#include <linux/kernel.h>

#include <linux/module.h>



asmlinkage void sha256_sparc64_transform(u32 *digest, const char *data,

					 unsigned int rounds);



static void sha256_block(struct crypto_sha256_state *sctx, const u8 *src,

			 int blocks)

{

	sha256_sparc64_transform(sctx->state, src, blocks);

}



static int sha256_sparc64_update(struct shash_desc *desc, const u8 *data,

				 unsigned int len)

{

	return sha256_base_do_update_blocks(desc, data, len, sha256_block);

}



static int sha256_sparc64_finup(struct shash_desc *desc, const u8 *src,

				unsigned int len, u8 *out)

{

	sha256_base_do_finup(desc, src, len, sha256_block);

	return sha256_base_finish(desc, out);

}



static struct shash_alg sha256_alg = {

	.digestsize	=	SHA256_DIGEST_SIZE,

	.init		=	sha256_base_init,

	.update		=	sha256_sparc64_update,

	.finup		=	sha256_sparc64_finup,

	.descsize	=	sizeof(struct crypto_sha256_state),

	.base		=	{

		.cra_name	=	"sha256",

		.cra_driver_name=	"sha256-sparc64",

		.cra_priority	=	SPARC_CR_OPCODE_PRIORITY,

		.cra_flags	=	CRYPTO_AHASH_ALG_BLOCK_ONLY |

					CRYPTO_AHASH_ALG_FINUP_MAX,

		.cra_blocksize	=	SHA256_BLOCK_SIZE,

		.cra_module	=	THIS_MODULE,

	}

};



static struct shash_alg sha224_alg = {

	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	sha224_base_init,

	.update		=	sha256_sparc64_update,

	.finup		=	sha256_sparc64_finup,

	.descsize	=	sizeof(struct crypto_sha256_state),

	.base		=	{

		.cra_name	=	"sha224",

		.cra_driver_name=	"sha224-sparc64",

		.cra_priority	=	SPARC_CR_OPCODE_PRIORITY,

		.cra_flags	=	CRYPTO_AHASH_ALG_BLOCK_ONLY |

					CRYPTO_AHASH_ALG_FINUP_MAX,

		.cra_blocksize	=	SHA224_BLOCK_SIZE,

		.cra_module	=	THIS_MODULE,

	}

};



static bool __init sparc64_has_sha256_opcode(void)

{

	unsigned long cfr;



	if (!(sparc64_elf_hwcap & HWCAP_SPARC_CRYPTO))

		return false;



	__asm__ __volatile__("rd %%asr26, %0" : "=r" (cfr));

	if (!(cfr & CFR_SHA256))

		return false;



	return true;

}



static int __init sha256_sparc64_mod_init(void)

{

	if (sparc64_has_sha256_opcode()) {

		int ret = crypto_register_shash(&sha224_alg);

		if (ret < 0)

			return ret;



		ret = crypto_register_shash(&sha256_alg);

		if (ret < 0) {

			crypto_unregister_shash(&sha224_alg);

			return ret;

		}



		pr_info("Using sparc64 sha256 opcode optimized SHA-256/SHA-224 implementation\n");

		return 0;

	}

	pr_info("sparc64 sha256 opcode not available.\n");

	return -ENODEV;

}



static void __exit sha256_sparc64_mod_fini(void)

{

	crypto_unregister_shash(&sha224_alg);

	crypto_unregister_shash(&sha256_alg);

}



module_init(sha256_sparc64_mod_init);

module_exit(sha256_sparc64_mod_fini);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 opcode accelerated");



MODULE_ALIAS_CRYPTO("sha224");

MODULE_ALIAS_CRYPTO("sha256");



#include "crop_devid.c"

arch/sparc/lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


asflags-y := -ansi -DST_DIV0=0x02



obj-y                 += crypto/

lib-$(CONFIG_SPARC32) += ashrdi3.o

lib-$(CONFIG_SPARC32) += memcpy.o memset.o

lib-y                 += strlen.o

arch/sparc/lib/crypto/Kconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



config CRYPTO_SHA256_SPARC64

	tristate

	depends on SPARC64

	default CRYPTO_LIB_SHA256

	select CRYPTO_ARCH_HAVE_LIB_SHA256

	select CRYPTO_LIB_SHA256_GENERIC