Commit 632dcef5 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: mips/poly1305 - remove redundant shash algorithm 



Since crypto/poly1305.c now registers a poly1305-$(ARCH) shash algorithm
that uses the architecture's Poly1305 library functions, individual
architectures no longer need to do the same.  Therefore, remove the
redundant shash algorithm from the arch-specific code and leave just the
library functions there.

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

arch/mips/crypto/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -4,13 +4,8 @@ menu "Accelerated Cryptographic Algorithms for CPU (mips)" 


config CRYPTO_POLY1305_MIPS

	tristate

	select CRYPTO_HASH

	select CRYPTO_ARCH_HAVE_LIB_POLY1305

	default CRYPTO_LIB_POLY1305_INTERNAL

	help

	  Poly1305 authenticator algorithm (RFC7539)



	  Architecture: mips



config CRYPTO_MD5_OCTEON

	tristate "Digests: MD5 (OCTEON)"

arch/mips/crypto/poly1305-glue.c

+2 −118
Original line number Diff line number Diff line
@@ -5,13 +5,10 @@ 
 * Copyright (C) 2019 Linaro Ltd. <ard.biesheuvel@linaro.org>

 */



#include <linux/unaligned.h>

#include <crypto/algapi.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/poly1305.h>

#include <crypto/poly1305.h>

#include <linux/cpufeature.h>

#include <linux/crypto.h>

#include <linux/module.h>

#include <linux/unaligned.h>



asmlinkage void poly1305_init_mips(void *state, const u8 *key);

asmlinkage void poly1305_blocks_mips(void *state, const u8 *src, u32 len, u32 hibit);
@@ -28,77 +25,6 @@ void poly1305_init_arch(struct poly1305_desc_ctx *dctx, const u8 key[POLY1305_KE 
}

EXPORT_SYMBOL(poly1305_init_arch);



static int mips_poly1305_init(struct shash_desc *desc)

{

	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);



	dctx->buflen = 0;

	dctx->rset = 0;

	dctx->sset = false;



	return 0;

}



static void mips_poly1305_blocks(struct poly1305_desc_ctx *dctx, const u8 *src,

				 u32 len, u32 hibit)

{

	if (unlikely(!dctx->sset)) {

		if (!dctx->rset) {

			poly1305_init_mips(&dctx->h, src);

			src += POLY1305_BLOCK_SIZE;

			len -= POLY1305_BLOCK_SIZE;

			dctx->rset = 1;

		}

		if (len >= POLY1305_BLOCK_SIZE) {

			dctx->s[0] = get_unaligned_le32(src +  0);

			dctx->s[1] = get_unaligned_le32(src +  4);

			dctx->s[2] = get_unaligned_le32(src +  8);

			dctx->s[3] = get_unaligned_le32(src + 12);

			src += POLY1305_BLOCK_SIZE;

			len -= POLY1305_BLOCK_SIZE;

			dctx->sset = true;

		}

		if (len < POLY1305_BLOCK_SIZE)

			return;

	}



	len &= ~(POLY1305_BLOCK_SIZE - 1);



	poly1305_blocks_mips(&dctx->h, src, len, hibit);

}



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

				unsigned int len)

{

	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);



	if (unlikely(dctx->buflen)) {

		u32 bytes = min(len, POLY1305_BLOCK_SIZE - dctx->buflen);



		memcpy(dctx->buf + dctx->buflen, src, bytes);

		src += bytes;

		len -= bytes;

		dctx->buflen += bytes;



		if (dctx->buflen == POLY1305_BLOCK_SIZE) {

			mips_poly1305_blocks(dctx, dctx->buf, POLY1305_BLOCK_SIZE, 1);

			dctx->buflen = 0;

		}

	}



	if (likely(len >= POLY1305_BLOCK_SIZE)) {

		mips_poly1305_blocks(dctx, src, len, 1);

		src += round_down(len, POLY1305_BLOCK_SIZE);

		len %= POLY1305_BLOCK_SIZE;

	}



	if (unlikely(len)) {

		dctx->buflen = len;

		memcpy(dctx->buf, src, len);

	}

	return 0;

}



void poly1305_update_arch(struct poly1305_desc_ctx *dctx, const u8 *src,

			  unsigned int nbytes)

{
@@ -146,53 +72,11 @@ void poly1305_final_arch(struct poly1305_desc_ctx *dctx, u8 *dst) 
}

EXPORT_SYMBOL(poly1305_final_arch);



static int mips_poly1305_final(struct shash_desc *desc, u8 *dst)

{

	struct poly1305_desc_ctx *dctx = shash_desc_ctx(desc);



	if (unlikely(!dctx->sset))

		return -ENOKEY;



	poly1305_final_arch(dctx, dst);

	return 0;

}



static struct shash_alg mips_poly1305_alg = {

	.init			= mips_poly1305_init,

	.update			= mips_poly1305_update,

	.final			= mips_poly1305_final,

	.digestsize		= POLY1305_DIGEST_SIZE,

	.descsize		= sizeof(struct poly1305_desc_ctx),



	.base.cra_name		= "poly1305",

	.base.cra_driver_name	= "poly1305-mips-old",

	.base.cra_priority	= 200,

	.base.cra_blocksize	= POLY1305_BLOCK_SIZE,

	.base.cra_module	= THIS_MODULE,

};



bool poly1305_is_arch_optimized(void)

{

	return true;

}

EXPORT_SYMBOL(poly1305_is_arch_optimized);



static int __init mips_poly1305_mod_init(void)

{

	return IS_REACHABLE(CONFIG_CRYPTO_HASH) ?

		crypto_register_shash(&mips_poly1305_alg) : 0;

}



static void __exit mips_poly1305_mod_exit(void)

{

	if (IS_REACHABLE(CONFIG_CRYPTO_HASH))

		crypto_unregister_shash(&mips_poly1305_alg);

}



arch_initcall(mips_poly1305_mod_init);

module_exit(mips_poly1305_mod_exit);



MODULE_DESCRIPTION("Poly1305 transform (MIPS accelerated");

MODULE_LICENSE("GPL v2");
 
MODULE_ALIAS_CRYPTO("poly1305");

MODULE_ALIAS_CRYPTO("poly1305-mips");