From 54aaed5c45ddf599f527606352201dd6b0d6be0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 11 Mar 2021 14:34:01 +0100 Subject: [PATCH] libzfs: zfs_crypto_create() requires a new key by definition: set newkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes the password prompt for new encryption roots from Enter passphrase: Re-enter passphrase: to Enter new passphrase: Re-enter new passphrase: which makes more sense and is more consistent with "new passphrase" now always meaning "come up with something" and plain "passphrase" "remember that thing" Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #11866 --- lib/libzfs/libzfs_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c index 450728c735..bd4d835686 100644 --- a/lib/libzfs/libzfs_crypto.c +++ b/lib/libzfs/libzfs_crypto.c @@ -954,7 +954,7 @@ zfs_crypto_create(libzfs_handle_t *hdl, char *parent_name, nvlist_t *props, } ret = populate_create_encryption_params_nvlists(hdl, NULL, - B_FALSE, keyformat, keylocation, props, &wkeydata, + B_TRUE, keyformat, keylocation, props, &wkeydata, &wkeylen); if (ret != 0) goto out;