xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: powerpc/sha1 - prefix the "sha1_" functions

Browse Source 
Prefix the PowerPC SHA-1 functions with "powerpc_sha1_" rather than
"sha1_".  This allows us to rename the library function sha_init() to
sha1_init() without causing a naming collision.

Cc: linuxppc-dev@lists.ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers
2020-05-02 11:24:23 -07:00
committed by Herbert Xu
parent 1c4b3c4099
commit 23dc2a0dfc
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/powerpc/crypto/sha1.c
View File

@@ -22,7 +22,7 @@
void powerpc_sha_transform(u32 *state, const u8 *src); void powerpc_sha_transform(u32 *state, const u8 *src);
static int sha1_init(struct shash_desc *desc) static int powerpc_sha1_init(struct shash_desc *desc)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); struct sha1_state *sctx = shash_desc_ctx(desc);
@@ -33,7 +33,7 @@ static int sha1_init(struct shash_desc *desc)
return 0; return 0;
} }
static int sha1_update(struct shash_desc *desc, const u8 *data, static int powerpc_sha1_update(struct shash_desc *desc, const u8 *data,
unsigned int len) unsigned int len)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); struct sha1_state *sctx = shash_desc_ctx(desc);
@@ -68,7 +68,7 @@ static int sha1_update(struct shash_desc *desc, const u8 *data,
/* Add padding and return the message digest. */ /* Add padding and return the message digest. */
static int sha1_final(struct shash_desc *desc, u8 *out) static int powerpc_sha1_final(struct shash_desc *desc, u8 *out)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); struct sha1_state *sctx = shash_desc_ctx(desc);
__be32 *dst = (__be32 *)out; __be32 *dst = (__be32 *)out;
@@ -81,10 +81,10 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
/* Pad out to 56 mod 64 */ /* Pad out to 56 mod 64 */
index = sctx->count & 0x3f; index = sctx->count & 0x3f;
padlen = (index < 56) ? (56 - index) : ((64+56) - index); padlen = (index < 56) ? (56 - index) : ((64+56) - index);
sha1_update(desc, padding, padlen); powerpc_sha1_update(desc, padding, padlen);
/* Append length */ /* Append length */
sha1_update(desc, (const u8 *)&bits, sizeof(bits)); powerpc_sha1_update(desc, (const u8 *)&bits, sizeof(bits));
/* Store state in digest */ /* Store state in digest */
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
@@ -96,7 +96,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
return 0; return 0;
} }
static int sha1_export(struct shash_desc *desc, void *out) static int powerpc_sha1_export(struct shash_desc *desc, void *out)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); struct sha1_state *sctx = shash_desc_ctx(desc);
@@ -104,7 +104,7 @@ static int sha1_export(struct shash_desc *desc, void *out)
return 0; return 0;
} }
static int sha1_import(struct shash_desc *desc, const void *in) static int powerpc_sha1_import(struct shash_desc *desc, const void *in)
{ {
struct sha1_state *sctx = shash_desc_ctx(desc); struct sha1_state *sctx = shash_desc_ctx(desc);
@@ -114,11 +114,11 @@ static int sha1_import(struct shash_desc *desc, const void *in)
static struct shash_alg alg = { static struct shash_alg alg = {
.digestsize = SHA1_DIGEST_SIZE, .digestsize = SHA1_DIGEST_SIZE,
.init = sha1_init, .init = powerpc_sha1_init,
.update = sha1_update, .update = powerpc_sha1_update,
.final = sha1_final, .final = powerpc_sha1_final,
.export = sha1_export, .export = powerpc_sha1_export,
.import = sha1_import, .import = powerpc_sha1_import,
.descsize = sizeof(struct sha1_state), .descsize = sizeof(struct sha1_state),
.statesize = sizeof(struct sha1_state), .statesize = sizeof(struct sha1_state),
.base = { .base = {