Commit 4dc94797 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: sparc/sha256 - Use API partial block handling 



Use the Crypto API partial block handling.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1340113b

arch/sparc/crypto/sha256_glue.c

+20 −101
Original line number Diff line number Diff line
@@ -11,133 +11,50 @@ 


#define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt



#include <asm/elf.h>

#include <asm/pstate.h>

#include <crypto/internal/hash.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/types.h>

#include <crypto/sha2.h>

#include <crypto/sha256_base.h>



#include <asm/pstate.h>

#include <asm/elf.h>

#include <linux/kernel.h>

#include <linux/module.h>



#include "opcodes.h"



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

					 unsigned int rounds);



static void __sha256_sparc64_update(struct sha256_state *sctx, const u8 *data,

				    unsigned int len, unsigned int partial)

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

			 int blocks)

{

	unsigned int done = 0;



	sctx->count += len;

	if (partial) {

		done = SHA256_BLOCK_SIZE - partial;

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

		sha256_sparc64_transform(sctx->state, sctx->buf, 1);

	}

	if (len - done >= SHA256_BLOCK_SIZE) {

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



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

		done += rounds * SHA256_BLOCK_SIZE;

	}



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

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

}



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

				 unsigned int len)

{

	struct sha256_state *sctx = shash_desc_ctx(desc);

	unsigned int partial = sctx->count % SHA256_BLOCK_SIZE;



	/* Handle the fast case right here */

	if (partial + len < SHA256_BLOCK_SIZE) {

		sctx->count += len;

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

	} else

		__sha256_sparc64_update(sctx, data, len, partial);



	return 0;

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

}



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

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

				unsigned int len, u8 *out)

{

	struct sha256_state *sctx = shash_desc_ctx(desc);

	unsigned int i, index, padlen;

	__be32 *dst = (__be32 *)out;

	__be64 bits;

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



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



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

	index = sctx->count % SHA256_BLOCK_SIZE;

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



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

	if (padlen <= 56) {

		sctx->count += padlen;

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

	} else {

		__sha256_sparc64_update(sctx, padding, padlen, index);

	}

	__sha256_sparc64_update(sctx, (const u8 *)&bits, sizeof(bits), 56);



	/* Store state in digest */

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

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



	/* Wipe context */

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



	return 0;

}



static int sha224_sparc64_final(struct shash_desc *desc, u8 *hash)

{

	u8 D[SHA256_DIGEST_SIZE];



	sha256_sparc64_final(desc, D);



	memcpy(hash, D, SHA224_DIGEST_SIZE);

	memzero_explicit(D, SHA256_DIGEST_SIZE);



	return 0;

}



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

{

	struct sha256_state *sctx = shash_desc_ctx(desc);



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

	return 0;

}



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

{

	struct sha256_state *sctx = shash_desc_ctx(desc);



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

	return 0;

	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,

	.final		=	sha256_sparc64_final,

	.export		=	sha256_sparc64_export,

	.import		=	sha256_sparc64_import,

	.descsize	=	sizeof(struct sha256_state),

	.statesize	=	sizeof(struct sha256_state),

	.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,

	}
@@ -147,12 +64,14 @@ static struct shash_alg sha224_alg = { 
	.digestsize	=	SHA224_DIGEST_SIZE,

	.init		=	sha224_base_init,

	.update		=	sha256_sparc64_update,

	.final		=	sha224_sparc64_final,

	.descsize	=	sizeof(struct sha256_state),

	.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,

	}