Commit eb7d6ba8 authored by Hans de Goede's avatar Hans de Goede Committed by Herbert Xu
Browse files

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>
parent b86fc489

arch/x86/crypto/sha256_ssse3_glue.c

+6 −6
Original line number Diff line number Diff line
@@ -45,7 +45,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);
@@ -84,7 +84,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,
@@ -151,7 +151,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,
@@ -233,7 +233,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,
@@ -313,7 +313,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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE