diff options
| author | emaste <emaste@FreeBSD.org> | 2017-09-08 20:41:49 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2017-09-08 20:41:49 +0000 |
| commit | d634f3bd72c51d9ed9075e2f140870c3feec1031 (patch) | |
| tree | e1dfd414d3bc7093b89e46c0e83a5a704554caf7 | |
| parent | 8f0063eac95489b0ec47e8707db84b0bddc7f33a (diff) | |
| download | FreeBSD-src-d634f3bd72c51d9ed9075e2f140870c3feec1031.zip FreeBSD-src-d634f3bd72c51d9ed9075e2f140870c3feec1031.tar.gz | |
MFC r323002: zfs: do not advertise unsupported hash algorithms
illumos 4185 ("add new cryptographic checksums to ZFS: SHA-512, Skein,
Edon-R") was intentionally merged only partially in r289422, without
adding support for skein, sha512 and edonr on FreeBSD.
Support for skein and sha512 was added later on (in head), but none of
these are supported in stable/10. Prior to this commit zfs(8) correctly
rejected these algorithms, but with an error message that claimed
support:
fk@r500 ~ $zfs set checksum=edonr tank
cannot set property for 'tank': 'checksum' must be one of 'on | off |
fletcher2 | fletcher4 | sha256 | sha512 | skein | edonr'
(This commit removes sha512 and skein in addition to edonr from the
merge of head's r323002.)
PR: 204055
Submitted by: Fabian Keil
Approved by: re (kib)
Obtained from: ElectroBSD
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c index c310a67b..d368d44 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c @@ -241,12 +241,12 @@ zfs_prop_init(void) zprop_register_index(ZFS_PROP_CHECKSUM, "checksum", ZIO_CHECKSUM_DEFAULT, PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, - "on | off | fletcher2 | fletcher4 | sha256 | sha512 | " - "skein | edonr", "CHECKSUM", checksum_table); + "on | off | fletcher2 | fletcher4 | sha256", + "CHECKSUM", checksum_table); zprop_register_index(ZFS_PROP_DEDUP, "dedup", ZIO_CHECKSUM_OFF, PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, - "on | off | verify | sha256[,verify], sha512[,verify], " - "skein[,verify], edonr,verify", "DEDUP", dedup_table); + "on | off | verify | sha256[,verify]", + "DEDUP", dedup_table); zprop_register_index(ZFS_PROP_COMPRESSION, "compression", ZIO_COMPRESS_DEFAULT, PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, |
