Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51e515fa authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: arm/sha1_neon - move SHA-1 NEON implementation to base layer 



This removes all the boilerplate from the existing implementation,
and replaces it with calls into the base layer.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 90451d6b

arch/arm/crypto/sha1_neon_glue.c

+24 −111
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/cryptohash.h>

#include <linux/types.h>

#include <crypto/sha.h>

#include <asm/byteorder.h>

#include <crypto/sha1_base.h>

#include <asm/neon.h>

#include <asm/simd.h>
@@ -34,138 +34,51 @@ 
asmlinkage void sha1_transform_neon(void *state_h, const char *data,

				    unsigned int rounds);





static int sha1_neon_init(struct shash_desc *desc)

{

	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_neon_update(struct shash_desc *desc, const u8 *data,

			       unsigned int len, unsigned int partial)

{

	struct sha1_state *sctx = shash_desc_ctx(desc);

	unsigned int done = 0;



	sctx->count += len;



	if (partial) {

		done = SHA1_BLOCK_SIZE - partial;

		memcpy(sctx->buffer + partial, data, done);

		sha1_transform_neon(sctx->state, sctx->buffer, 1);

	}



	if (len - done >= SHA1_BLOCK_SIZE) {

		const unsigned int rounds = (len - done) / SHA1_BLOCK_SIZE;



		sha1_transform_neon(sctx->state, data + done, rounds);

		done += rounds * SHA1_BLOCK_SIZE;

	}



	memcpy(sctx->buffer, data + done, len - done);



	return 0;

}



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

			  unsigned int len)

{

	struct sha1_state *sctx = shash_desc_ctx(desc);

	unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;

	int res;



	/* Handle the fast case right here */

	if (partial + len < SHA1_BLOCK_SIZE) {

		sctx->count += len;

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



		return 0;

	}



	if (!may_use_simd()) {

		res = sha1_update_arm(desc, data, len);

	} else {

		kernel_neon_begin();

		res = __sha1_neon_update(desc, data, len, partial);

		kernel_neon_end();

	}



	return res;

}



	if (!may_use_simd() ||

	    (sctx->count % SHA1_BLOCK_SIZE) + len < SHA1_BLOCK_SIZE)

		return sha1_update_arm(desc, data, len);



/* Add padding and return the message digest. */

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

{

	struct sha1_state *sctx = shash_desc_ctx(desc);

	unsigned int i, index, padlen;

	__be32 *dst = (__be32 *)out;

	__be64 bits;

	static const u8 padding[SHA1_BLOCK_SIZE] = { 0x80, };



	bits = cpu_to_be64(sctx->count << 3);



	/* Pad out to 56 mod 64 and append length */

	index = sctx->count % SHA1_BLOCK_SIZE;

	padlen = (index < 56) ? (56 - index) : ((SHA1_BLOCK_SIZE+56) - index);

	if (!may_use_simd()) {

		sha1_update_arm(desc, padding, padlen);

		sha1_update_arm(desc, (const u8 *)&bits, sizeof(bits));

	} else {

	kernel_neon_begin();

		/* We need to fill a whole block for __sha1_neon_update() */

		if (padlen <= 56) {

			sctx->count += padlen;

			memcpy(sctx->buffer + index, padding, padlen);

		} else {

			__sha1_neon_update(desc, padding, padlen, index);

		}

		__sha1_neon_update(desc, (const u8 *)&bits, sizeof(bits), 56);

	sha1_base_do_update(desc, data, len,

			    (sha1_block_fn *)sha1_transform_neon);

	kernel_neon_end();

	}



	/* Store state in digest */

	for (i = 0; i < 5; i++)

		dst[i] = cpu_to_be32(sctx->state[i]);



	/* Wipe context */

	memset(sctx, 0, sizeof(*sctx));



	return 0;

}



static int sha1_neon_export(struct shash_desc *desc, void *out)

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

			   unsigned int len, u8 *out)

{

	struct sha1_state *sctx = shash_desc_ctx(desc);

	if (!may_use_simd())

		return sha1_finup_arm(desc, data, len, out);



	memcpy(out, sctx, sizeof(*sctx));

	kernel_neon_begin();

	if (len)

		sha1_base_do_update(desc, data, len,

				    (sha1_block_fn *)sha1_transform_neon);

	sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_transform_neon);

	kernel_neon_end();



	return 0;

	return sha1_base_finish(desc, out);

}



static int sha1_neon_import(struct shash_desc *desc, const void *in)

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

{

	struct sha1_state *sctx = shash_desc_ctx(desc);



	memcpy(sctx, in, sizeof(*sctx));



	return 0;

	return sha1_neon_finup(desc, NULL, 0, out);

}



static struct shash_alg alg = {

	.digestsize	=	SHA1_DIGEST_SIZE,

	.init		=	sha1_neon_init,

	.init		=	sha1_base_init,

	.update		=	sha1_neon_update,

	.final		=	sha1_neon_final,

	.export		=	sha1_neon_export,

	.import		=	sha1_neon_import,

	.finup		=	sha1_neon_finup,

	.descsize	=	sizeof(struct sha1_state),

	.statesize	=	sizeof(struct sha1_state),

	.base		=	{

		.cra_name		= "sha1",

		.cra_driver_name	= "sha1-neon",