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

crypto: lib/chacha - remove unused arch-specific init support 



All implementations of chacha_init_arch() just call
chacha_init_generic(), so it is pointless.  Just delete it, and replace
chacha_init() with what was previously chacha_init_generic().

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fce8b8d5

arch/arm/crypto/chacha-glue.c

+2 −8
Original line number Diff line number Diff line
@@ -76,12 +76,6 @@ void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds) 
}

EXPORT_SYMBOL(hchacha_block_arch);



void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)

{

	chacha_init_generic(state, key, iv);

}

EXPORT_SYMBOL(chacha_init_arch);



void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,

		       int nrounds)

{
@@ -116,7 +110,7 @@ static int chacha_stream_xor(struct skcipher_request *req, 


	err = skcipher_walk_virt(&walk, req, false);



	chacha_init_generic(state, ctx->key, iv);

	chacha_init(state, ctx->key, iv);



	while (walk.nbytes > 0) {

		unsigned int nbytes = walk.nbytes;
@@ -166,7 +160,7 @@ static int do_xchacha(struct skcipher_request *req, bool neon) 
	u32 state[16];

	u8 real_iv[16];



	chacha_init_generic(state, ctx->key, req->iv);

	chacha_init(state, ctx->key, req->iv);



	if (!IS_ENABLED(CONFIG_KERNEL_MODE_NEON) || !neon) {

		hchacha_block_arm(state, subctx.key, ctx->nrounds);

arch/arm64/crypto/chacha-neon-glue.c

+2 −8
Original line number Diff line number Diff line
@@ -74,12 +74,6 @@ void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds) 
}

EXPORT_SYMBOL(hchacha_block_arch);



void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)

{

	chacha_init_generic(state, key, iv);

}

EXPORT_SYMBOL(chacha_init_arch);



void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,

		       int nrounds)

{
@@ -110,7 +104,7 @@ static int chacha_neon_stream_xor(struct skcipher_request *req, 


	err = skcipher_walk_virt(&walk, req, false);



	chacha_init_generic(state, ctx->key, iv);

	chacha_init(state, ctx->key, iv);



	while (walk.nbytes > 0) {

		unsigned int nbytes = walk.nbytes;
@@ -151,7 +145,7 @@ static int xchacha_neon(struct skcipher_request *req) 
	u32 state[16];

	u8 real_iv[16];



	chacha_init_generic(state, ctx->key, req->iv);

	chacha_init(state, ctx->key, req->iv);

	hchacha_block_arch(state, subctx.key, ctx->nrounds);

	subctx.nrounds = ctx->nrounds;

arch/mips/crypto/chacha-glue.c

+2 −8
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ EXPORT_SYMBOL(chacha_crypt_arch); 
asmlinkage void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds);

EXPORT_SYMBOL(hchacha_block_arch);



void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)

{

	chacha_init_generic(state, key, iv);

}

EXPORT_SYMBOL(chacha_init_arch);



static int chacha_mips_stream_xor(struct skcipher_request *req,

				  const struct chacha_ctx *ctx, const u8 *iv)

{
@@ -35,7 +29,7 @@ static int chacha_mips_stream_xor(struct skcipher_request *req, 


	err = skcipher_walk_virt(&walk, req, false);



	chacha_init_generic(state, ctx->key, iv);

	chacha_init(state, ctx->key, iv);



	while (walk.nbytes > 0) {

		unsigned int nbytes = walk.nbytes;
@@ -67,7 +61,7 @@ static int xchacha_mips(struct skcipher_request *req) 
	u32 state[16];

	u8 real_iv[16];



	chacha_init_generic(state, ctx->key, req->iv);

	chacha_init(state, ctx->key, req->iv);



	hchacha_block(state, subctx.key, ctx->nrounds);

	subctx.nrounds = ctx->nrounds;

arch/powerpc/crypto/chacha-p10-glue.c

+2 −8
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds) 
}

EXPORT_SYMBOL(hchacha_block_arch);



void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)

{

	chacha_init_generic(state, key, iv);

}

EXPORT_SYMBOL(chacha_init_arch);



void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,

		       int nrounds)

{
@@ -95,7 +89,7 @@ static int chacha_p10_stream_xor(struct skcipher_request *req, 
	if (err)

		return err;



	chacha_init_generic(state, ctx->key, iv);

	chacha_init(state, ctx->key, iv);



	while (walk.nbytes > 0) {

		unsigned int nbytes = walk.nbytes;
@@ -137,7 +131,7 @@ static int xchacha_p10(struct skcipher_request *req) 
	u32 state[16];

	u8 real_iv[16];



	chacha_init_generic(state, ctx->key, req->iv);

	chacha_init(state, ctx->key, req->iv);

	hchacha_block_arch(state, subctx.key, ctx->nrounds);

	subctx.nrounds = ctx->nrounds;

arch/s390/crypto/chacha-glue.c

+1 −7
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int chacha20_s390(struct skcipher_request *req) 
	int rc;



	rc = skcipher_walk_virt(&walk, req, false);

	chacha_init_generic(state, ctx->key, req->iv);

	chacha_init(state, ctx->key, req->iv);



	while (walk.nbytes > 0) {

		nbytes = walk.nbytes;
@@ -69,12 +69,6 @@ void hchacha_block_arch(const u32 *state, u32 *stream, int nrounds) 
}

EXPORT_SYMBOL(hchacha_block_arch);



void chacha_init_arch(u32 *state, const u32 *key, const u8 *iv)

{

	chacha_init_generic(state, key, iv);

}

EXPORT_SYMBOL(chacha_init_arch);



void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src,

		       unsigned int bytes, int nrounds)

{