svn commit: r323331 - stable/10/sys/cddl/contrib/opensolaris/common/zfs

[Ed Maste]

Author: emaste
Date: Fri Sep  8 20:41:49 2017
New Revision: 323331
URL: https://svnweb.freebsd.org/changeset/base/323331

Log:
  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 at 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

Modified:
  stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Fri Sep  8 20:20:35 2017	(r323330)
+++ stable/10/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Fri Sep  8 20:41:49 2017	(r323331)
@@ -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,