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

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
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
.endm .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) * int blocks)
*/ */
SYM_FUNC_START(sha1_ce_transform) SYM_FUNC_START(__sha1_ce_transform)
/* load round constants */ /* load round constants */
loadrc k0.4s, 0x5a827999, w6 loadrc k0.4s, 0x5a827999, w6
loadrc k1.4s, 0x6ed9eba1, w6 loadrc k1.4s, 0x6ed9eba1, w6
...@@ -147,4 +147,4 @@ CPU_LE( rev32 v11.16b, v11.16b ) ...@@ -147,4 +147,4 @@ CPU_LE( rev32 v11.16b, v11.16b )
str dgb, [x0, #16] str dgb, [x0, #16]
mov w0, w2 mov w0, w2
ret ret
SYM_FUNC_END(sha1_ce_transform) SYM_FUNC_END(__sha1_ce_transform)
...@@ -29,18 +29,19 @@ struct sha1_ce_state { ...@@ -29,18 +29,19 @@ struct sha1_ce_state {
extern const u32 sha1_ce_offsetof_count; extern const u32 sha1_ce_offsetof_count;
extern const u32 sha1_ce_offsetof_finalize; 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); 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) int blocks)
{ {
while (blocks) { while (blocks) {
int rem; int rem;
kernel_neon_begin(); kernel_neon_begin();
rem = sha1_ce_transform(container_of(sst, struct sha1_ce_state, rem = __sha1_ce_transform(container_of(sst,
sst), src, blocks); struct sha1_ce_state,
sst), src, blocks);
kernel_neon_end(); kernel_neon_end();
src += (blocks - rem) * SHA1_BLOCK_SIZE; src += (blocks - rem) * SHA1_BLOCK_SIZE;
blocks = rem; blocks = rem;
...@@ -59,7 +60,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data, ...@@ -59,7 +60,7 @@ static int sha1_ce_update(struct shash_desc *desc, const u8 *data,
return crypto_sha1_update(desc, data, len); return crypto_sha1_update(desc, data, len);
sctx->finalize = 0; 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; return 0;
} }
...@@ -79,9 +80,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data, ...@@ -79,9 +80,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data,
*/ */
sctx->finalize = finalize; 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) if (!finalize)
sha1_base_do_finalize(desc, __sha1_ce_transform); sha1_base_do_finalize(desc, sha1_ce_transform);
return sha1_base_finish(desc, out); return sha1_base_finish(desc, out);
} }
...@@ -93,7 +94,7 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out) ...@@ -93,7 +94,7 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out)
return crypto_sha1_finup(desc, NULL, 0, out); return crypto_sha1_finup(desc, NULL, 0, out);
sctx->finalize = 0; 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); return sha1_base_finish(desc, out);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment