c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-22 08:51:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

sha256_generic: make internal functions a little more private

Browse Source 
Linux 6.18 has conflicting prototypes for various sha256_* and sha512_*
functions, which we get through a very long include chain. That's tough
to fix right now; easier is just to rename our internal functions.

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
This commit is contained in:
Rob Norris 2025-09-29 09:32:50 +10:00 committed by Brian Behlendorf
parent a82b804250
commit f4ead6682c
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
module/icp/algs/sha2/sha2_generic.c
View File

@ -77,7 +77,8 @@ static const uint32_t SHA256_K[64] = {
h = g, g = f, f = e, e = d + T1; \ h = g, g = f, f = e, e = d + T1; \
d = c, c = b, b = a, a = T1 + T2; d = c, c = b, b = a, a = T1 + T2;
static void sha256_generic(uint32_t state[8], const void *data, size_t num_blks) static void
icp_sha256_generic(uint32_t state[8], const void *data, size_t num_blks)
{ {
uint64_t blk; uint64_t blk;
@ -173,7 +174,8 @@ static const uint64_t SHA512_K[80] = {
0x5fcb6fab3ad6faec, 0x6c44198c4a475817 0x5fcb6fab3ad6faec, 0x6c44198c4a475817
}; };
static void sha512_generic(uint64_t state[8], const void *data, size_t num_blks) static void
icp_sha512_generic(uint64_t state[8], const void *data, size_t num_blks)
{ {
uint64_t blk; uint64_t blk;
@ -226,7 +228,8 @@ static void sha512_generic(uint64_t state[8], const void *data, size_t num_blks)
} }
} }
static void sha256_update(sha256_ctx *ctx, const uint8_t *data, size_t len) static void
icp_sha256_update(sha256_ctx *ctx, const uint8_t *data, size_t len)
{ {
uint64_t pos = ctx->count[0]; uint64_t pos = ctx->count[0];
uint64_t total = ctx->count[1]; uint64_t total = ctx->count[1];
@ -258,7 +261,8 @@ static void sha256_update(sha256_ctx *ctx, const uint8_t *data, size_t len)
ctx->count[1] = total; ctx->count[1] = total;
} }
static void sha512_update(sha512_ctx *ctx, const uint8_t *data, size_t len) static void
icp_sha512_update(sha512_ctx *ctx, const uint8_t *data, size_t len)
{ {
uint64_t pos = ctx->count[0]; uint64_t pos = ctx->count[0];
uint64_t total = ctx->count[1]; uint64_t total = ctx->count[1];
@ -290,7 +294,8 @@ static void sha512_update(sha512_ctx *ctx, const uint8_t *data, size_t len)
ctx->count[1] = total; ctx->count[1] = total;
} }
static void sha256_final(sha256_ctx *ctx, uint8_t *result, int bits) static void
icp_sha256_final(sha256_ctx *ctx, uint8_t *result, int bits)
{ {
uint64_t mlen, pos = ctx->count[0]; uint64_t mlen, pos = ctx->count[0];
uint8_t *m = ctx->wbuf; uint8_t *m = ctx->wbuf;
@ -334,7 +339,8 @@ static void sha256_final(sha256_ctx *ctx, uint8_t *result, int bits)
memset(ctx, 0, sizeof (*ctx)); memset(ctx, 0, sizeof (*ctx));
} }
static void sha512_final(sha512_ctx *ctx, uint8_t *result, int bits) static void
icp_sha512_final(sha512_ctx *ctx, uint8_t *result, int bits)
{ {
uint64_t mlen, pos = ctx->count[0]; uint64_t mlen, pos = ctx->count[0];
uint8_t *m = ctx->wbuf, *r; uint8_t *m = ctx->wbuf, *r;
@ -461,14 +467,14 @@ SHA2Update(SHA2_CTX *ctx, const void *data, size_t len)
switch (ctx->algotype) { switch (ctx->algotype) {
case SHA256: case SHA256:
sha256_update(&ctx->sha256, data, len); icp_sha256_update(&ctx->sha256, data, len);
break; break;
case SHA512: case SHA512:
case SHA512_HMAC_MECH_INFO_TYPE: case SHA512_HMAC_MECH_INFO_TYPE:
sha512_update(&ctx->sha512, data, len); icp_sha512_update(&ctx->sha512, data, len);
break; break;
case SHA512_256: case SHA512_256:
sha512_update(&ctx->sha512, data, len); icp_sha512_update(&ctx->sha512, data, len);
break; break;
} }
} }
@ -479,32 +485,33 @@ SHA2Final(void *digest, SHA2_CTX *ctx)
{ {
switch (ctx->algotype) { switch (ctx->algotype) {
case SHA256: case SHA256:
sha256_final(&ctx->sha256, digest, 256); icp_sha256_final(&ctx->sha256, digest, 256);
break; break;
case SHA512: case SHA512:
case SHA512_HMAC_MECH_INFO_TYPE: case SHA512_HMAC_MECH_INFO_TYPE:
sha512_final(&ctx->sha512, digest, 512); icp_sha512_final(&ctx->sha512, digest, 512);
break; break;
case SHA512_256: case SHA512_256:
sha512_final(&ctx->sha512, digest, 256); icp_sha512_final(&ctx->sha512, digest, 256);
break; break;
} }
} }
/* the generic implementation is always okay */ /* the generic implementation is always okay */
static boolean_t sha2_is_supported(void) static boolean_t
icp_sha2_is_supported(void)
{ {
return (B_TRUE); return (B_TRUE);
} }
const sha256_ops_t sha256_generic_impl = { const sha256_ops_t sha256_generic_impl = {
.name = "generic", .name = "generic",
.transform = sha256_generic, .transform = icp_sha256_generic,
.is_supported = sha2_is_supported .is_supported = icp_sha2_is_supported
}; };
const sha512_ops_t sha512_generic_impl = { const sha512_ops_t sha512_generic_impl = {
.name = "generic", .name = "generic",
.transform = sha512_generic, .transform = icp_sha512_generic,
.is_supported = sha2_is_supported .is_supported = icp_sha2_is_supported
}; };