Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593d6805 authored by Hans de Goede's avatar Hans de Goede Committed by Sami Tolvanen
Browse files

UPSTREAM: crypto: x86 - 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>
(cherry picked from commit eb7d6ba882f1c508f5387416375d4c2f99debc7b)
Bug: 145297900
Change-Id: I71c660caea1b28089d57e85ee94aad454e0e8d02
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent de9dea05

arch/x86/crypto/sha256_ssse3_glue.c

+6 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ asmlinkage void sha256_transform_ssse3(u32 *digest, const char *data, 
				       u64 rounds);

typedef void (sha256_transform_fn)(u32 *digest, const char *data, u64 rounds);



static int sha256_update(struct shash_desc *desc, const u8 *data,

static int _sha256_update(struct shash_desc *desc, const u8 *data,

			  unsigned int len, sha256_transform_fn *sha256_xform)

{

	struct sha256_state *sctx = shash_desc_ctx(desc);
@@ -83,7 +83,7 @@ static int sha256_finup(struct shash_desc *desc, const u8 *data, 
static int sha256_ssse3_update(struct shash_desc *desc, const u8 *data,

			 unsigned int len)

{

	return sha256_update(desc, data, len, sha256_transform_ssse3);

	return _sha256_update(desc, data, len, sha256_transform_ssse3);

}



static int sha256_ssse3_finup(struct shash_desc *desc, const u8 *data,
@@ -152,7 +152,7 @@ asmlinkage void sha256_transform_avx(u32 *digest, const char *data, 
static int sha256_avx_update(struct shash_desc *desc, const u8 *data,

			 unsigned int len)

{

	return sha256_update(desc, data, len, sha256_transform_avx);

	return _sha256_update(desc, data, len, sha256_transform_avx);

}



static int sha256_avx_finup(struct shash_desc *desc, const u8 *data,
@@ -236,7 +236,7 @@ asmlinkage void sha256_transform_rorx(u32 *digest, const char *data, 
static int sha256_avx2_update(struct shash_desc *desc, const u8 *data,

			 unsigned int len)

{

	return sha256_update(desc, data, len, sha256_transform_rorx);

	return _sha256_update(desc, data, len, sha256_transform_rorx);

}



static int sha256_avx2_finup(struct shash_desc *desc, const u8 *data,
@@ -318,7 +318,7 @@ asmlinkage void sha256_ni_transform(u32 *digest, const char *data, 
static int sha256_ni_update(struct shash_desc *desc, const u8 *data,

			 unsigned int len)

{

	return sha256_update(desc, data, len, sha256_ni_transform);

	return _sha256_update(desc, data, len, sha256_ni_transform);

}



static int sha256_ni_finup(struct shash_desc *desc, const u8 *data,