mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
OpenZFS 4185 - add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Garrett D'Amore <garrett@damore.org> Ported by: Tony Hutter <hutter2@llnl.gov> OpenZFS-issue: https://www.illumos.org/issues/4185 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/45818ee Porting Notes: This code is ported on top of the Illumos Crypto Framework code: https://github.com/zfsonlinux/zfs/pull/4329/commits/b5e030c8dbb9cd393d313571dee4756fbba8c22d The list of porting changes includes: - Copied module/icp/include/sha2/sha2.h directly from illumos - Removed from module/icp/algs/sha2/sha2.c: #pragma inline(SHA256Init, SHA384Init, SHA512Init) - Added 'ctx' to lib/libzfs/libzfs_sendrecv.c:zio_checksum_SHA256() since it now takes in an extra parameter. - Added CTASSERT() to assert.h from for module/zfs/edonr_zfs.c - Added skein & edonr to libicp/Makefile.am - Added sha512.S. It was generated from sha512-x86_64.pl in Illumos. - Updated ztest.c with new fletcher_4_*() args; used NULL for new CTX argument. - In icp/algs/edonr/edonr_byteorder.h, Removed the #if defined(__linux) section to not #include the non-existant endian.h. - In skein_test.c, renane NULL to 0 in "no test vector" array entries to get around a compiler warning. - Fixup test files: - Rename <sys/varargs.h> -> <varargs.h>, <strings.h> -> <string.h>, - Remove <note.h> and define NOTE() as NOP. - Define u_longlong_t - Rename "#!/usr/bin/ksh" -> "#!/bin/ksh -p" - Rename NULL to 0 in "no test vector" array entries to get around a compiler warning. - Remove "for isa in $($ISAINFO); do" stuff - Add/update Makefiles - Add some userspace headers like stdio.h/stdlib.h in places of sys/types.h. - EXPORT_SYMBOL *_Init/*_Update/*_Final... routines in ICP modules. - Update scripts/zfs2zol-patch.sed - include <sys/sha2.h> in sha2_impl.h - Add sha2.h to include/sys/Makefile.am - Add skein and edonr dirs to icp Makefile - Add new checksums to zpool_get.cfg - Move checksum switch block from zfs_secpolicy_setprop() to zfs_check_settable() - Fix -Wuninitialized error in edonr_byteorder.h on PPC - Fix stack frame size errors on ARM32 - Don't unroll loops in Skein on 32-bit to save stack space - Add memory barriers in sha2.c on 32-bit to save stack space - Add filetest_001_pos.ksh checksum sanity test - Add option to write psudorandom data in file_write utility
This commit is contained in:
@@ -30,6 +30,9 @@
|
||||
#include <inttypes.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <stdint.h>
|
||||
|
||||
typedef unsigned char uchar_t;
|
||||
typedef long long longlong_t;
|
||||
@@ -44,6 +47,16 @@ static unsigned char bigbuffer[BIGBUFFERSIZE];
|
||||
|
||||
static void usage(char *);
|
||||
|
||||
/*
|
||||
* psudo-randomize the buffer
|
||||
*/
|
||||
void randomize_buffer(int block_size) {
|
||||
int i;
|
||||
char rnd = rand() & 0xff;
|
||||
for (i = 0; i < block_size; i++)
|
||||
bigbuffer[i] ^= rnd;
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
@@ -81,7 +94,10 @@ main(int argc, char **argv)
|
||||
write_count = atoi(optarg);
|
||||
break;
|
||||
case 'd':
|
||||
fillchar = atoi(optarg);
|
||||
if (optarg[0] == 'R')
|
||||
fillchar = 'R'; /* R = random data */
|
||||
else
|
||||
fillchar = atoi(optarg);
|
||||
break;
|
||||
case 's':
|
||||
offset = atoll(optarg);
|
||||
@@ -138,6 +154,9 @@ main(int argc, char **argv)
|
||||
nxtfillchar = fillchar;
|
||||
k = 0;
|
||||
|
||||
if (fillchar == 'R')
|
||||
srand(time(NULL));
|
||||
|
||||
for (i = 0; i < block_size; i++) {
|
||||
bigbuffer[i] = nxtfillchar;
|
||||
|
||||
@@ -146,6 +165,8 @@ main(int argc, char **argv)
|
||||
k = 0;
|
||||
}
|
||||
nxtfillchar = k++;
|
||||
} else if (fillchar == 'R') {
|
||||
nxtfillchar = rand() & 0xff;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -191,14 +212,21 @@ main(int argc, char **argv)
|
||||
|
||||
if (verbose) {
|
||||
(void) printf("%s: block_size = %d, write_count = %d, "
|
||||
"offset = %lld, data = %s%d\n", filename, block_size,
|
||||
write_count, offset,
|
||||
(fillchar == 0) ? "0->" : "",
|
||||
(fillchar == 0) ? DATA_RANGE : fillchar);
|
||||
"offset = %lld, ", filename, block_size,
|
||||
write_count, offset);
|
||||
if (fillchar == 'R') {
|
||||
(void) printf("data = [random]\n");
|
||||
} else {
|
||||
(void) printf("data = %s%d\n",
|
||||
(fillchar == 0) ? "0->" : "",
|
||||
(fillchar == 0) ? DATA_RANGE : fillchar);
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < write_count; i++) {
|
||||
ssize_t n;
|
||||
if (fillchar == 'R')
|
||||
randomize_buffer(block_size);
|
||||
|
||||
if ((n = write(bigfd, &bigbuffer, block_size)) == -1) {
|
||||
(void) printf("write failed (%ld), good_writes = %"
|
||||
@@ -224,9 +252,11 @@ usage(char *prog)
|
||||
{
|
||||
(void) printf("Usage: %s [-v] -o {create,overwrite,append} -f file_name"
|
||||
" [-b block_size]\n"
|
||||
"\t[-s offset] [-c write_count] [-d data]\n"
|
||||
"\twhere [data] equal to zero causes chars "
|
||||
"0->%d to be repeated throughout\n", prog, DATA_RANGE);
|
||||
"\t[-s offset] [-c write_count] [-d data]\n\n"
|
||||
"Where [data] equal to zero causes chars "
|
||||
"0->%d to be repeated throughout, or [data]\n"
|
||||
"equal to 'R' for psudorandom data.\n",
|
||||
prog, DATA_RANGE);
|
||||
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user