Commit 8f373bf4 authored by Hans de Goede's avatar Hans de Goede Committed by Herbert Xu

crypto: arm64 - Rename functions to avoid conflict with crypto/sha256.h

Rename static / file-local functions so that they do not conflict with
the functions declared in crypto/sha256.h.

This is a preparation patch for folding crypto/sha256.h into crypto/sha.h.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e4dcc1be
...@@ -30,15 +30,15 @@ EXPORT_SYMBOL(sha256_block_data_order); ...@@ -30,15 +30,15 @@ EXPORT_SYMBOL(sha256_block_data_order);
asmlinkage void sha256_block_neon(u32 *digest, const void *data, asmlinkage void sha256_block_neon(u32 *digest, const void *data,
unsigned int num_blks); unsigned int num_blks);
static int sha256_update(struct shash_desc *desc, const u8 *data, static int crypto_sha256_arm64_update(struct shash_desc *desc, const u8 *data,
unsigned int len) unsigned int len)
{ {
return sha256_base_do_update(desc, data, len, return sha256_base_do_update(desc, data, len,
(sha256_block_fn *)sha256_block_data_order); (sha256_block_fn *)sha256_block_data_order);
} }
static int sha256_finup(struct shash_desc *desc, const u8 *data, static int crypto_sha256_arm64_finup(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *out) unsigned int len, u8 *out)
{ {
if (len) if (len)
sha256_base_do_update(desc, data, len, sha256_base_do_update(desc, data, len,
...@@ -49,17 +49,17 @@ static int sha256_finup(struct shash_desc *desc, const u8 *data, ...@@ -49,17 +49,17 @@ static int sha256_finup(struct shash_desc *desc, const u8 *data,
return sha256_base_finish(desc, out); return sha256_base_finish(desc, out);
} }
static int sha256_final(struct shash_desc *desc, u8 *out) static int crypto_sha256_arm64_final(struct shash_desc *desc, u8 *out)
{ {
return sha256_finup(desc, NULL, 0, out); return crypto_sha256_arm64_finup(desc, NULL, 0, out);
} }
static struct shash_alg algs[] = { { static struct shash_alg algs[] = { {
.digestsize = SHA256_DIGEST_SIZE, .digestsize = SHA256_DIGEST_SIZE,
.init = sha256_base_init, .init = sha256_base_init,
.update = sha256_update, .update = crypto_sha256_arm64_update,
.final = sha256_final, .final = crypto_sha256_arm64_final,
.finup = sha256_finup, .finup = crypto_sha256_arm64_finup,
.descsize = sizeof(struct sha256_state), .descsize = sizeof(struct sha256_state),
.base.cra_name = "sha256", .base.cra_name = "sha256",
.base.cra_driver_name = "sha256-arm64", .base.cra_driver_name = "sha256-arm64",
...@@ -69,9 +69,9 @@ static struct shash_alg algs[] = { { ...@@ -69,9 +69,9 @@ static struct shash_alg algs[] = { {
}, { }, {
.digestsize = SHA224_DIGEST_SIZE, .digestsize = SHA224_DIGEST_SIZE,
.init = sha224_base_init, .init = sha224_base_init,
.update = sha256_update, .update = crypto_sha256_arm64_update,
.final = sha256_final, .final = crypto_sha256_arm64_final,
.finup = sha256_finup, .finup = crypto_sha256_arm64_finup,
.descsize = sizeof(struct sha256_state), .descsize = sizeof(struct sha256_state),
.base.cra_name = "sha224", .base.cra_name = "sha224",
.base.cra_driver_name = "sha224-arm64", .base.cra_driver_name = "sha224-arm64",
......
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