c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-25 03:37:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove bcopy(), bzero(), bcmp()

Browse Source 
bcopy() has a confusing argument order and is actually a move, not a
copy; they're all deprecated since POSIX.1-2001 and removed in -2008,
and we shim them out to mem*() on Linux anyway

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12996
This commit is contained in:
наб
2022-02-25 14:26:54 +01:00
committed by Brian Behlendorf
parent 1d77d62f5a
commit 861166b027
129 changed files with 990 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/checksum/edonr_test.c
+2 -2
View File
@@ -160,7 +160,7 @@ main(int argc, char *argv[])
EdonRFinal(&ctx, digest); \
(void) printf("Edon-R-%-6sMessage: " #_m \
"\tResult: ", #mode); \
if (bcmp(digest, testdigest, mode / 8) == 0) { \
if (memcmp(digest, testdigest, mode / 8) == 0) { \
(void) printf("OK\n"); \
} else { \
(void) printf("FAILED!\n"); \
@@ -177,7 +177,7 @@ main(int argc, char *argv[])
double cpb = 0; \
int i; \
struct timeval start, end; \
bzero(block, sizeof (block)); \
memset(block, 0, sizeof (block)); \
(void) gettimeofday(&start, NULL); \
EdonRInit(&ctx, mode); \
for (i = 0; i < 8192; i++) \
tests/zfs-tests/tests/functional/checksum/sha2_test.c
+2 -2
View File
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
SHA2Final(digest, &ctx); \
(void) printf("SHA%-9sMessage: " #_m \
"\tResult: ", #mode); \
if (bcmp(digest, testdigest, diglen / 8) == 0) { \
if (memcmp(digest, testdigest, diglen / 8) == 0) { \
(void) printf("OK\n"); \
} else { \
(void) printf("FAILED!\n"); \
@@ -206,7 +206,7 @@ main(int argc, char *argv[])
double cpb = 0; \
int i; \
struct timeval start, end; \
bzero(block, sizeof (block)); \
memset(block, 0, sizeof (block)); \
(void) gettimeofday(&start, NULL); \
SHA2Init(SHA ## mode ## _MECH_INFO_TYPE, &ctx); \
for (i = 0; i < 8192; i++) \
tests/zfs-tests/tests/functional/checksum/skein_test.c
+2 -2
View File
@@ -278,7 +278,7 @@ main(int argc, char *argv[])
(void) Skein ## mode ## _Final(&ctx, digest); \
(void) printf("Skein" #mode "/" #diglen \
"\tMessage: " #_m "\tResult: "); \
if (bcmp(digest, testdigest, diglen / 8) == 0) { \
if (memcmp(digest, testdigest, diglen / 8) == 0) { \
(void) printf("OK\n"); \
} else { \
(void) printf("FAILED!\n"); \
@@ -295,7 +295,7 @@ main(int argc, char *argv[])
double cpb = 0; \
int i; \
struct timeval start, end; \
bzero(block, sizeof (block)); \
memset(block, 0, sizeof (block)); \
(void) gettimeofday(&start, NULL); \
(void) Skein ## mode ## _Init(&ctx, diglen); \
for (i = 0; i < 8192; i++) { \
tests/zfs-tests/tests/functional/hkdf/hkdf_test.c
+6 -9
View File
@@ -174,12 +174,9 @@ static hkdf_tv_t test_vectors[] = {
static void
hexdump(char *str, uint8_t *src, uint_t len)
{
int i;
printf("\t%s\t", str);
for (i = 0; i < len; i++) {
printf("%02x", src[i] & 0xff);
}
for (int i = 0; i < len; i++)
printf("%02hhx", src[i]);
printf("\n");
}
@@ -187,21 +184,21 @@ static int
run_test(int i, hkdf_tv_t *tv)
{
int ret;
uint8_t okey[SHA512_DIGEST_LENGTH];
uint8_t good[SHA512_DIGEST_LENGTH];
printf("TEST %d:\t", i);
ret = hkdf_sha512((uint8_t *)tv->ikm, tv->ikm_len, (uint8_t *)tv->salt,
tv->salt_len, (uint8_t *)tv->info, tv->info_len, okey, tv->okm_len);
tv->salt_len, (uint8_t *)tv->info, tv->info_len, good, tv->okm_len);
if (ret != 0) {
printf("HKDF failed with error code %d\n", ret);
return (ret);
}
if (bcmp(okey, tv->okm, tv->okm_len) != 0) {
if (memcmp(good, tv->okm, tv->okm_len) != 0) {
printf("Output Mismatch\n");
hexdump("Expected:", (uint8_t *)tv->okm, tv->okm_len);
hexdump("Actual: ", okey, tv->okm_len);
hexdump("Actual: ", good, tv->okm_len);
return (1);
}