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

crypto: arm64/sha2-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.  __sha2_ce_transform() and
__sha256_block_data_order() got this backwards.  Fix this, albeit
without changing "sha256_block_data_order" in the perlasm since that is
OpenSSL code.  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 1f9f3a52

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

+4 −4
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ 
	.word		0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2



	/*

	 * void sha2_ce_transform(struct sha256_ce_state *sst, u8 const *src,

	 * int __sha256_ce_transform(struct sha256_ce_state *sst, u8 const *src,

	 *			     int blocks)

	 */

	.text

SYM_FUNC_START(sha2_ce_transform)

SYM_FUNC_START(__sha256_ce_transform)

	/* load round constants */

	adr_l		x8, .Lsha2_rcon

	ld1		{ v0.4s- v3.4s}, [x8], #64
@@ -154,4 +154,4 @@ CPU_LE( rev32 v19.16b, v19.16b ) 
3:	st1		{dgav.4s, dgbv.4s}, [x0]

	mov		w0, w2

	ret

SYM_FUNC_END(sha2_ce_transform)
 
SYM_FUNC_END(__sha256_ce_transform)

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

+16 −15
Original line number Diff line number Diff line
@@ -30,17 +30,18 @@ struct sha256_ce_state { 
extern const u32 sha256_ce_offsetof_count;

extern const u32 sha256_ce_offsetof_finalize;



asmlinkage int sha2_ce_transform(struct sha256_ce_state *sst, u8 const *src,

asmlinkage int __sha256_ce_transform(struct sha256_ce_state *sst, u8 const *src,

				     int blocks);



static void __sha2_ce_transform(struct sha256_state *sst, u8 const *src,

static void sha256_ce_transform(struct sha256_state *sst, u8 const *src,

				int blocks)

{

	while (blocks) {

		int rem;



		kernel_neon_begin();

		rem = sha2_ce_transform(container_of(sst, struct sha256_ce_state,

		rem = __sha256_ce_transform(container_of(sst,

							 struct sha256_ce_state,

							 sst), src, blocks);

		kernel_neon_end();

		src += (blocks - rem) * SHA256_BLOCK_SIZE;
@@ -55,7 +56,7 @@ const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state, 


asmlinkage void sha256_block_data_order(u32 *digest, u8 const *src, int blocks);



static void __sha256_block_data_order(struct sha256_state *sst, u8 const *src,

static void sha256_arm64_transform(struct sha256_state *sst, u8 const *src,

				   int blocks)

{

	sha256_block_data_order(sst->state, src, blocks);
@@ -68,10 +69,10 @@ static int sha256_ce_update(struct shash_desc *desc, const u8 *data, 


	if (!crypto_simd_usable())

		return sha256_base_do_update(desc, data, len,

				__sha256_block_data_order);

					     sha256_arm64_transform);



	sctx->finalize = 0;

	sha256_base_do_update(desc, data, len, __sha2_ce_transform);

	sha256_base_do_update(desc, data, len, sha256_ce_transform);



	return 0;

}
@@ -85,8 +86,8 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, 
	if (!crypto_simd_usable()) {

		if (len)

			sha256_base_do_update(desc, data, len,

				__sha256_block_data_order);

		sha256_base_do_finalize(desc, __sha256_block_data_order);

					      sha256_arm64_transform);

		sha256_base_do_finalize(desc, sha256_arm64_transform);

		return sha256_base_finish(desc, out);

	}
@@ -96,9 +97,9 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, 
	 */

	sctx->finalize = finalize;



	sha256_base_do_update(desc, data, len, __sha2_ce_transform);

	sha256_base_do_update(desc, data, len, sha256_ce_transform);

	if (!finalize)

		sha256_base_do_finalize(desc, __sha2_ce_transform);

		sha256_base_do_finalize(desc, sha256_ce_transform);

	return sha256_base_finish(desc, out);

}
@@ -107,12 +108,12 @@ static int sha256_ce_final(struct shash_desc *desc, u8 *out) 
	struct sha256_ce_state *sctx = shash_desc_ctx(desc);



	if (!crypto_simd_usable()) {

		sha256_base_do_finalize(desc, __sha256_block_data_order);

		sha256_base_do_finalize(desc, sha256_arm64_transform);

		return sha256_base_finish(desc, out);

	}



	sctx->finalize = 0;

	sha256_base_do_finalize(desc, __sha2_ce_transform);

	sha256_base_do_finalize(desc, sha256_ce_transform);

	return sha256_base_finish(desc, out);

}