Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Alias pbkdf2iters to kdfparams 

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
This commit is contained in:
наб 2024-02-08 18:55:17 +01:00
parent 387053d979
commit 7c74565320
No known key found for this signature in database
GPG Key ID: BCFD0B018D2658F1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/man7/zfsprops.7
View File

@ -1176,7 +1176,7 @@ Datasets using
cannot be unlocked with OpenZFS <2.2.3. cannot be unlocked with OpenZFS <2.2.3.
This property may be changed with This property may be changed with
.Nm zfs Cm change-key . .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 Controls KDF parameters that a
.Sy passphrase .Sy passphrase
encryption key should be run through when processing it into an encryption key. encryption key should be run through when processing it into an encryption key.

2
module/zcommon/zfs_prop.c
View File

@ -679,7 +679,7 @@ zfs_prop_init(void)
B_TRUE, sfeatures); B_TRUE, sfeatures);
zprop_register_number(ZFS_PROP_PBKDF2_ITERS, "pbkdf2iters", zprop_register_number(ZFS_PROP_PBKDF2_ITERS, "pbkdf2iters",
0, PROP_ONETIME_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, 0, PROP_ONETIME_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
"<iters>", "PBKDF2ITERS", B_TRUE, sfeatures); "<iters>", "KDFPARAMS", B_TRUE, sfeatures);
zprop_register_number(ZFS_PROP_OBJSETID, "objsetid", 0, zprop_register_number(ZFS_PROP_OBJSETID, "objsetid", 0,
PROP_READONLY, ZFS_TYPE_DATASET, "<uint64>", "OBJSETID", B_TRUE, PROP_READONLY, ZFS_TYPE_DATASET, "<uint64>", "OBJSETID", B_TRUE,
sfeatures); sfeatures);