diff options
| author | allanjude <allanjude@FreeBSD.org> | 2016-05-31 04:12:14 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2016-05-31 04:12:14 +0000 |
| commit | 8cebbf47bee9b1cc2332b4b67d327c92ad7bba14 (patch) | |
| tree | 19cc4a13c7faa377faf81a3fd0bb6a7465e7aa3f /sys/crypto | |
| parent | 02067b6b421e6305f6cb229f64ad5f88a3b664d5 (diff) | |
| download | FreeBSD-src-8cebbf47bee9b1cc2332b4b67d327c92ad7bba14.zip FreeBSD-src-8cebbf47bee9b1cc2332b4b67d327c92ad7bba14.tar.gz | |
Connect the SHA-512t256 and Skein hashing algorithms to ZFS
Support for the new hashing algorithms in ZFS was introduced in r289422
However it was disconnected because FreeBSD lacked implementations of
SHA-512 (truncated to 256 bits), and Skein.
These implementations were introduced in r300921 and r300966 respectively
This commit connects them to ZFS and enabled these new checksum algorithms
This new algorithms are not supported by the boot blocks, so do not use them
on your root dataset if you boot from ZFS.
Relnotes: yes
Sponsored by: ScaleEngine Inc.
Diffstat (limited to 'sys/crypto')
| -rw-r--r-- | sys/crypto/skein/skein_port.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/crypto/skein/skein_port.h b/sys/crypto/skein/skein_port.h index 65f3405..7025a51 100644 --- a/sys/crypto/skein/skein_port.h +++ b/sys/crypto/skein/skein_port.h @@ -19,7 +19,9 @@ #include <sys/endian.h> #include <sys/types.h> +#ifndef _OPENSOLARIS_SYS_TYPES_H_ /* Avoid redefining this typedef */ typedef unsigned int uint_t; /* native unsigned integer */ +#endif typedef u_int8_t u08b_t; /* 8-bit unsigned integer */ typedef u_int32_t uint_32t; /* 32-bit unsigned integer */ typedef u_int64_t u64b_t; /* 64-bit unsigned integer */ |
