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

crypto: arm64/sha1-ce - clean up backwards function names 



In the Linux kernel, a function whose name has two leading underscores
is conventionally called by the same-named function without leading
underscores -- not the other way around.  __sha1_ce_transform() got this
backwards.  Fix this.  No change in behavior.

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

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

+4 −4
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ 
	.endm



	/*

	 * int sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,

	 * int __sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,

	 *			   int blocks)

	 */

SYM_FUNC_START(sha1_ce_transform)

SYM_FUNC_START(__sha1_ce_transform)

	/* load round constants */

	loadrc		k0.4s, 0x5a827999, w6

	loadrc		k1.4s, 0x6ed9eba1, w6
@@ -147,4 +147,4 @@ CPU_LE( rev32 v11.16b, v11.16b ) 
	str		dgb, [x0, #16]

	mov		w0, w2

	ret

SYM_FUNC_END(sha1_ce_transform)
 
SYM_FUNC_END(__sha1_ce_transform)

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

+11 −10
Original line number Diff line number Diff line
@@ -29,17 +29,18 @@ struct sha1_ce_state { 
extern const u32 sha1_ce_offsetof_count;

extern const u32 sha1_ce_offsetof_finalize;



asmlinkage int sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,

asmlinkage int __sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src,

				   int blocks);



static void __sha1_ce_transform(struct sha1_state *sst, u8 const *src,

static void sha1_ce_transform(struct sha1_state *sst, u8 const *src,

			      int blocks)

{

	while (blocks) {

		int rem;



		kernel_neon_begin();

		rem = sha1_ce_transform(container_of(sst, struct sha1_ce_state,

		rem = __sha1_ce_transform(container_of(sst,

						       struct sha1_ce_state,

						       sst), src, blocks);

		kernel_neon_end();

		src += (blocks - rem) * SHA1_BLOCK_SIZE;
@@ -59,7 +60,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data, 
		return crypto_sha1_update(desc, data, len);



	sctx->finalize = 0;

	sha1_base_do_update(desc, data, len, __sha1_ce_transform);

	sha1_base_do_update(desc, data, len, sha1_ce_transform);



	return 0;

}
@@ -79,9 +80,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data, 
	 */

	sctx->finalize = finalize;



	sha1_base_do_update(desc, data, len, __sha1_ce_transform);

	sha1_base_do_update(desc, data, len, sha1_ce_transform);

	if (!finalize)

		sha1_base_do_finalize(desc, __sha1_ce_transform);

		sha1_base_do_finalize(desc, sha1_ce_transform);

	return sha1_base_finish(desc, out);

}
@@ -93,7 +94,7 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out) 
		return crypto_sha1_finup(desc, NULL, 0, out);



	sctx->finalize = 0;

	sha1_base_do_finalize(desc, __sha1_ce_transform);

	sha1_base_do_finalize(desc, sha1_ce_transform);

	return sha1_base_finish(desc, out);

}