Skip to content

Commit

Permalink
Alias pbkdf2iters to kdfparams
Browse files Browse the repository at this point in the history
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
  • Loading branch information
nabijaczleweli committed Feb 8, 2024
1 parent 387053d commit 7c74565
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion man/man7/zfsprops.7
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion module/zcommon/zfs_prop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
"<iters>", "PBKDF2ITERS", B_TRUE, sfeatures);
"<iters>", "KDFPARAMS", B_TRUE, sfeatures);
zprop_register_number(ZFS_PROP_OBJSETID, "objsetid", 0,
PROP_READONLY, ZFS_TYPE_DATASET, "<uint64>", "OBJSETID", B_TRUE,
sfeatures);
Expand Down

0 comments on commit 7c74565

Please sign in to comment.