static int opt_dump_master_key = 0;
static int opt_shared = 0;
static int opt_allow_discards = 0;
-static int opt_without_activation = 0;
+static int opt_test_passphrase = 0;
static const char **action_argv;
static int action_argc;
data_device = NULL;
}
- activated_name = opt_without_activation ? NULL : action_argv[1];
+ activated_name = opt_test_passphrase ? NULL : action_argv[1];
if ((r = crypt_init(&cd, header_device)))
goto out;
{ "uuid", '\0', POPT_ARG_STRING, &opt_uuid, 0, N_("UUID for device to use."), NULL },
{ "allow-discards", '\0', POPT_ARG_NONE, &opt_allow_discards, 0, N_("Allow discards (aka TRIM) requests for device."), NULL },
{ "header", '\0', POPT_ARG_STRING, &opt_header_device, 0, N_("Device or file with separated LUKS header."), NULL },
- { "without-activation",'\0', POPT_ARG_NONE, &opt_without_activation, 0, N_("Do not activate device, just check passphrase."), NULL },
+ { "test-passphrase", '\0', POPT_ARG_NONE, &opt_test_passphrase, 0, N_("Do not activate device, just check passphrase."), NULL },
POPT_TABLEEND
};
poptContext popt_context;
/* FIXME: rewrite this from scratch */
- if (opt_shared && strcmp(aname, "create")) {
+ if (opt_shared && strcmp(aname, "create"))
usage(popt_context, EXIT_FAILURE,
_("Option --shared is allowed only for create operation.\n"),
poptGetInvocationName(popt_context));
- }
if (opt_allow_discards &&
strcmp(aname, "luksOpen") &&
strcmp(aname, "create") &&
- strcmp(aname, "loopaesOpen")) {
+ strcmp(aname, "loopaesOpen"))
usage(popt_context, EXIT_FAILURE,
_("Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"),
poptGetInvocationName(popt_context));
- }
if (opt_key_size &&
strcmp(aname, "luksFormat") &&
strcmp(aname, "create") &&
- strcmp(aname, "loopaesOpen")) {
+ strcmp(aname, "loopaesOpen"))
usage(popt_context, EXIT_FAILURE,
_("Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
"To limit read from keyfile use --keyfile-size=(bytes)."),
poptGetInvocationName(popt_context));
- }
- if (opt_without_activation &&
+ if (opt_test_passphrase &&
strcmp(aname, "luksOpen"))
usage(popt_context, EXIT_FAILURE,
- _("Option --without-activation is allowed only for luksOpen.\n"),
+ _("Option --test-passphrase is allowed only for luksOpen.\n"),
poptGetInvocationName(popt_context));
if (opt_key_size % 8)
}
if (opt_keyfile_size < 0 || opt_new_keyfile_size < 0 || opt_key_size < 0 ||
- opt_keyfile_offset < 0 || opt_new_keyfile_offset < 0) {
+ opt_keyfile_offset < 0 || opt_new_keyfile_offset < 0)
usage(popt_context, EXIT_FAILURE,
_("Negative number for option not permitted."),
poptGetInvocationName(popt_context));
- }
if (opt_random && opt_urandom)
usage(popt_context, EXIT_FAILURE, _("Only one of --use-[u]random options is allowed."),