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

[ Upstream commit e4dcc1be15268b6d34de3968f906577591521bd5 ]

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: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Stable-dep-of: 53cc9baeb9bc ("crypto: arm/sha - fix function cast warnings")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/crypto/sha256_glue.c b/arch/arm/crypto/sha256_glue.c
index 0ae900e778f3ba5fab9bfd9c5eaeecbf3a293aaf..040c744ef9f50cd5faac8c8e1c86e37b925b81b1 100644 (file)
--- a/arch/arm/crypto/sha256_glue.c
+++ b/arch/arm/crypto/sha256_glue.c
@@ -44,7 +44,7 @@ int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,
 }
 EXPORT_SYMBOL(crypto_sha256_arm_update);
 
-static int sha256_final(struct shash_desc *desc, u8 *out)
+static int crypto_sha256_arm_final(struct shash_desc *desc, u8 *out)
 {
        sha256_base_do_finalize(desc,
                                (sha256_block_fn *)sha256_block_data_order);
@@ -56,7 +56,7 @@ int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data,
 {
        sha256_base_do_update(desc, data, len,
                              (sha256_block_fn *)sha256_block_data_order);
-       return sha256_final(desc, out);
+       return crypto_sha256_arm_final(desc, out);
 }
 EXPORT_SYMBOL(crypto_sha256_arm_finup);
 
@@ -64,7 +64,7 @@ static struct shash_alg algs[] = { {
        .digestsize     =       SHA256_DIGEST_SIZE,
        .init           =       sha256_base_init,
        .update         =       crypto_sha256_arm_update,
-       .final          =       sha256_final,
+       .final          =       crypto_sha256_arm_final,
        .finup          =       crypto_sha256_arm_finup,
        .descsize       =       sizeof(struct sha256_state),
        .base           =       {
@@ -78,7 +78,7 @@ static struct shash_alg algs[] = { {
        .digestsize     =       SHA224_DIGEST_SIZE,
        .init           =       sha224_base_init,
        .update         =       crypto_sha256_arm_update,
-       .final          =       sha256_final,
+       .final          =       crypto_sha256_arm_final,
        .finup          =       crypto_sha256_arm_finup,
        .descsize       =       sizeof(struct sha256_state),
        .base           =       {

diff --git a/arch/arm/crypto/sha256_neon_glue.c b/arch/arm/crypto/sha256_neon_glue.c
index 1d82c6cd31a41c9974816adcdb605112fb274318..8d296529c8ba7f85d0cd206286d8959407f44244 100644 (file)
--- a/arch/arm/crypto/sha256_neon_glue.c
+++ b/arch/arm/crypto/sha256_neon_glue.c
@@ -29,8 +29,8 @@
 asmlinkage void sha256_block_data_order_neon(u32 *digest, const void *data,
                                             unsigned int num_blks);
 
-static int sha256_update(struct shash_desc *desc, const u8 *data,
-                        unsigned int len)
+static int crypto_sha256_neon_update(struct shash_desc *desc, const u8 *data,
+                                    unsigned int len)
 {
        struct sha256_state *sctx = shash_desc_ctx(desc);
 
@@ -46,8 +46,8 @@ static int sha256_update(struct shash_desc *desc, const u8 *data,
        return 0;
 }
 
-static int sha256_finup(struct shash_desc *desc, const u8 *data,
-                       unsigned int len, u8 *out)
+static int crypto_sha256_neon_finup(struct shash_desc *desc, const u8 *data,
+                                   unsigned int len, u8 *out)
 {
        if (!may_use_simd())
                return crypto_sha256_arm_finup(desc, data, len, out);
@@ -63,17 +63,17 @@ static int sha256_finup(struct shash_desc *desc, const u8 *data,
        return sha256_base_finish(desc, out);
 }
 
-static int sha256_final(struct shash_desc *desc, u8 *out)
+static int crypto_sha256_neon_final(struct shash_desc *desc, u8 *out)
 {
-       return sha256_finup(desc, NULL, 0, out);
+       return crypto_sha256_neon_finup(desc, NULL, 0, out);
 }
 
 struct shash_alg sha256_neon_algs[] = { {
        .digestsize     =       SHA256_DIGEST_SIZE,
        .init           =       sha256_base_init,
-       .update         =       sha256_update,
-       .final          =       sha256_final,
-       .finup          =       sha256_finup,
+       .update         =       crypto_sha256_neon_update,
+       .final          =       crypto_sha256_neon_final,
+       .finup          =       crypto_sha256_neon_finup,
        .descsize       =       sizeof(struct sha256_state),
        .base           =       {
                .cra_name       =       "sha256",
@@ -85,9 +85,9 @@ struct shash_alg sha256_neon_algs[] = { {
 }, {
        .digestsize     =       SHA224_DIGEST_SIZE,
        .init           =       sha224_base_init,
-       .update         =       sha256_update,
-       .final          =       sha256_final,
-       .finup          =       sha256_finup,
+       .update         =       crypto_sha256_neon_update,
+       .final          =       crypto_sha256_neon_final,
+       .finup          =       crypto_sha256_neon_finup,
        .descsize       =       sizeof(struct sha256_state),
        .base           =       {
                .cra_name       =       "sha224",