crypto: arm/sha1-ce - move SHA-1 ARMv8 implementation to base layer (dde00981) · Commits · jan.koester / Linux

arch/arm/crypto/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@ config CRYPTO_SHA1_ARM_CE
	tristate "SHA1 digest algorithm (ARM v8 Crypto Extensions)"		tristate "SHA1 digest algorithm (ARM v8 Crypto Extensions)"
	depends on KERNEL_MODE_NEON		depends on KERNEL_MODE_NEON
	select CRYPTO_SHA1_ARM		select CRYPTO_SHA1_ARM
	select CRYPTO_SHA1
	select CRYPTO_HASH		select CRYPTO_HASH
	help		help
	SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented		SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented

arch/arm/crypto/sha1-ce-core.S

+7 −16

Original line number	Original line	Diff line number	Diff line
	@@ -61,8 +61,8 @@
	.word 0xca62c1d6, 0xca62c1d6, 0xca62c1d6, 0xca62c1d6		.word 0xca62c1d6, 0xca62c1d6, 0xca62c1d6, 0xca62c1d6

	/*		/*
	* void sha1_ce_transform(int blocks, u8 const src, u32 state,		* void sha1_ce_transform(struct sha1_state sst, u8 const src,
	* u8 *head);		* int blocks);
	*/		*/
	ENTRY(sha1_ce_transform)		ENTRY(sha1_ce_transform)
	/* load round constants */		/* load round constants */
	@@ -71,23 +71,14 @@ ENTRY(sha1_ce_transform)
	vld1.32 {k2-k3}, [ip, :128]		vld1.32 {k2-k3}, [ip, :128]

	/* load state */		/* load state */
	vld1.32 {dga}, [r2]		vld1.32 {dga}, [r0]
	vldr dgbs, [r2, #16]		vldr dgbs, [r0, #16]

	/* load partial input (if supplied) */
	teq r3, #0
	beq 0f
	vld1.32 {q8-q9}, [r3]!
	vld1.32 {q10-q11}, [r3]
	teq r0, #0
	b 1f

	/* load input */		/* load input */
	0: vld1.32 {q8-q9}, [r1]!		0: vld1.32 {q8-q9}, [r1]!
	vld1.32 {q10-q11}, [r1]!		vld1.32 {q10-q11}, [r1]!
	subs r0, r0, #1		subs r2, r2, #1

	1:
	#ifndef CONFIG_CPU_BIG_ENDIAN		#ifndef CONFIG_CPU_BIG_ENDIAN
	vrev32.8 q8, q8		vrev32.8 q8, q8
	vrev32.8 q9, q9		vrev32.8 q9, q9
	@@ -128,7 +119,7 @@ ENTRY(sha1_ce_transform)
	bne 0b		bne 0b

	/* store new state */		/* store new state */
	vst1.32 {dga}, [r2]		vst1.32 {dga}, [r0]
	vstr dgbs, [r2, #16]		vstr dgbs, [r0, #16]
	bx lr		bx lr
	ENDPROC(sha1_ce_transform)		ENDPROC(sha1_ce_transform)

arch/arm/crypto/sha1-ce-glue.c

+26 −81

Original line number	Original line	Diff line number	Diff line
	@@ -10,13 +10,13 @@

	#include <crypto/internal/hash.h>		#include <crypto/internal/hash.h>
	#include <crypto/sha.h>		#include <crypto/sha.h>
			#include <crypto/sha1_base.h>
	#include <linux/crypto.h>		#include <linux/crypto.h>
	#include <linux/module.h>		#include <linux/module.h>

	#include <asm/hwcap.h>		#include <asm/hwcap.h>
	#include <asm/neon.h>		#include <asm/neon.h>
	#include <asm/simd.h>		#include <asm/simd.h>
	#include <asm/unaligned.h>

	#include "sha1.h"		#include "sha1.h"

	@@ -24,107 +24,52 @@ MODULE_DESCRIPTION("SHA1 secure hash using ARMv8 Crypto Extensions");
	MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");		MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
	MODULE_LICENSE("GPL v2");		MODULE_LICENSE("GPL v2");

	asmlinkage void sha1_ce_transform(int blocks, u8 const src, u32 state,		asmlinkage void sha1_ce_transform(struct sha1_state sst, u8 const src,
	u8 *head);		int blocks);

	static int sha1_init(struct shash_desc *desc)		static int sha1_ce_update(struct shash_desc desc, const u8 data,
	{
	struct sha1_state *sctx = shash_desc_ctx(desc);

	*sctx = (struct sha1_state){
	.state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },
	};
	return 0;
	}

	static int sha1_update(struct shash_desc desc, const u8 data,
	unsigned int len)		unsigned int len)
	{		{
	struct sha1_state *sctx = shash_desc_ctx(desc);		struct sha1_state *sctx = shash_desc_ctx(desc);
	unsigned int partial;

	if (!may_use_simd())		if (!may_use_simd() \|\|
			(sctx->count % SHA1_BLOCK_SIZE) + len < SHA1_BLOCK_SIZE)
	return sha1_update_arm(desc, data, len);		return sha1_update_arm(desc, data, len);

	partial = sctx->count % SHA1_BLOCK_SIZE;
	sctx->count += len;

	if ((partial + len) >= SHA1_BLOCK_SIZE) {
	int blocks;

	if (partial) {
	int p = SHA1_BLOCK_SIZE - partial;

	memcpy(sctx->buffer + partial, data, p);
	data += p;
	len -= p;
	}

	blocks = len / SHA1_BLOCK_SIZE;
	len %= SHA1_BLOCK_SIZE;

	kernel_neon_begin();		kernel_neon_begin();
	sha1_ce_transform(blocks, data, sctx->state,		sha1_base_do_update(desc, data, len, sha1_ce_transform);
	partial ? sctx->buffer : NULL);
	kernel_neon_end();		kernel_neon_end();

	data += blocks * SHA1_BLOCK_SIZE;
	partial = 0;
	}
	if (len)
	memcpy(sctx->buffer + partial, data, len);
	return 0;		return 0;
	}		}

	static int sha1_final(struct shash_desc desc, u8 out)		static int sha1_ce_finup(struct shash_desc desc, const u8 data,
			unsigned int len, u8 *out)
	{		{
	static const u8 padding[SHA1_BLOCK_SIZE] = { 0x80, };		if (!may_use_simd())
			return sha1_finup_arm(desc, data, len, out);
	struct sha1_state *sctx = shash_desc_ctx(desc);
	__be64 bits = cpu_to_be64(sctx->count << 3);
	__be32 dst = (__be32 )out;
	int i;

	u32 padlen = SHA1_BLOCK_SIZE
	- ((sctx->count + sizeof(bits)) % SHA1_BLOCK_SIZE);

	sha1_update(desc, padding, padlen);
	sha1_update(desc, (const u8 *)&bits, sizeof(bits));

	for (i = 0; i < SHA1_DIGEST_SIZE / sizeof(__be32); i++)
	put_unaligned_be32(sctx->state[i], dst++);

	*sctx = (struct sha1_state){};
	return 0;
	}

	static int sha1_export(struct shash_desc desc, void out)		kernel_neon_begin();
	{		if (len)
	struct sha1_state *sctx = shash_desc_ctx(desc);		sha1_base_do_update(desc, data, len, sha1_ce_transform);
	struct sha1_state *dst = out;		sha1_base_do_finalize(desc, sha1_ce_transform);
			kernel_neon_end();

	dst = sctx;		return sha1_base_finish(desc, out);
	return 0;
	}		}

	static int sha1_import(struct shash_desc desc, const void in)		static int sha1_ce_final(struct shash_desc desc, u8 out)
	{		{
	struct sha1_state *sctx = shash_desc_ctx(desc);		return sha1_ce_finup(desc, NULL, 0, out);
	struct sha1_state const *src = in;

	sctx = src;
	return 0;
	}		}

	static struct shash_alg alg = {		static struct shash_alg alg = {
	.init = sha1_init,		.init = sha1_base_init,
	.update = sha1_update,		.update = sha1_ce_update,
	.final = sha1_final,		.final = sha1_ce_final,
	.export = sha1_export,		.finup = sha1_ce_finup,
	.import = sha1_import,
	.descsize = sizeof(struct sha1_state),		.descsize = sizeof(struct sha1_state),
	.digestsize = SHA1_DIGEST_SIZE,		.digestsize = SHA1_DIGEST_SIZE,
	.statesize = sizeof(struct sha1_state),
	.base = {		.base = {
	.cra_name = "sha1",		.cra_name = "sha1",
	.cra_driver_name = "sha1-ce",		.cra_driver_name = "sha1-ce",