svn commit: r290757 - in stable/10: cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/common/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/ut...

[Fabian Keil]

Alexander Motin <mav at FreeBSD.org> wrote:

> Author: mav
> Date: Fri Nov 13 09:32:04 2015
> New Revision: 290757
> URL: https://svnweb.freebsd.org/changeset/base/290757
> 
> Log:
>   MFC r289422:
>   4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R
[...]  
>   This is only a partial merge of respective ZFS infrastructure changes.
>   At this moment FreeBSD kernel has no those crypto algorithms, so the
>   parts of the code to enable them are commented out.  When they are
>   implemented, it will be trivial to plug them in.
[...]
> @@ -225,12 +240,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", "CHECKSUM",
> -	    checksum_table);
> +	    "on | off | fletcher2 | fletcher4 | sha256 | sha512 | "
> +	    "skein | edonr", "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]", "DEDUP",
> -	    dedup_table);
> +	    "on | off | verify | sha256[,verify], sha512[,verify], "
> +	    "skein[,verify], edonr,verify", "DEDUP", dedup_table);
>  	zprop_register_index(ZFS_PROP_COMPRESSION, "compression",
>  	    ZIO_COMPRESS_DEFAULT, PROP_INHERIT,
>  	    ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,

This chunk causes confusing error messages:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204055

Fabian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20151113/42ee71d5/attachment.bin>