From 6b8e553ecc3c7e561bdd8a896f4501e984a27f9d Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 3 May 2018 18:09:40 +0200 Subject: [PATCH] Remove subcondition for reencryption --keep-key parameter. If removed subcondition was true --keep-key parameter (alone) would fail the command. But it is valid to request reencryption of LUKS header and applying defaults to pbkdf parameters. --- src/cryptsetup_reencrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c index 79541aff..048a05a9 100644 --- a/src/cryptsetup_reencrypt.c +++ b/src/cryptsetup_reencrypt.c @@ -1748,7 +1748,7 @@ int main(int argc, const char **argv) usage(popt_context, EXIT_FAILURE, _("Option --new must be used together with --reduce-device-size or --header."), poptGetInvocationName(popt_context)); - if (opt_keep_key && ((!opt_hash && !opt_iteration_time && !opt_pbkdf_iterations) || opt_cipher || opt_new || opt_master_key_file)) + if (opt_keep_key && (opt_cipher || opt_new || opt_master_key_file)) usage(popt_context, EXIT_FAILURE, _("Option --keep-key can be used only with --hash, --iter-time or --pbkdf-force-iterations."), poptGetInvocationName(popt_context));