From cc820a7537e37eba37ad05e50aeef443a1da5b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 8 Feb 2024 18:55:17 +0100 Subject: [PATCH] Alias pbkdf2iters to kdfparams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ahelenia Ziemiańska --- man/man7/zfsprops.7 | 2 +- module/zcommon/zfs_prop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/man7/zfsprops.7 b/man/man7/zfsprops.7 index 791eb59c1a78..4bd698226900 100644 --- a/man/man7/zfsprops.7 +++ b/man/man7/zfsprops.7 @@ -1176,7 +1176,7 @@ Datasets using cannot be unlocked with OpenZFS <2.2.3. This property may be changed with .Nm zfs Cm change-key . -.It Sy pbkdf2iters Ns = Ns Ar iterations +.It Sy pbkdf2iters Ns = Ns Ar parameters Pq Sy kdfparams Ns = Ns Ar parameters Controls KDF parameters that a .Sy passphrase encryption key should be run through when processing it into an encryption key. diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index e811b9a7e043..f74ee95c148c 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -679,7 +679,7 @@ zfs_prop_init(void) B_TRUE, sfeatures); zprop_register_number(ZFS_PROP_PBKDF2_ITERS, "pbkdf2iters", 0, PROP_ONETIME_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, - "", "PBKDF2ITERS", B_TRUE, sfeatures); + "", "KDFPARAMS", B_TRUE, sfeatures); zprop_register_number(ZFS_PROP_OBJSETID, "objsetid", 0, PROP_READONLY, ZFS_TYPE_DATASET, "", "OBJSETID", B_TRUE, sfeatures);