static const char *opt_header_backup_file = NULL;
static const char *opt_uuid = NULL;
static const char *opt_header_device = NULL;
+static const char *opt_type = "luks";
static int opt_key_size = 0;
static long opt_keyfile_size = 0;
static long opt_new_keyfile_size = 0;
static uint64_t opt_skip = 0;
static int opt_skip_valid = 0;
static int opt_readonly = 0;
-static int opt_iteration_time = 1000;
+static int opt_iteration_time = DEFAULT_LUKS1_ITER_TIME;
static int opt_version_mode = 0;
static int opt_timeout = 0;
static int opt_tries = 3;
static int action_argc;
static const char *null_action_argv[] = {NULL, NULL};
-static int action_create(int arg);
-static int action_remove(int arg);
-static int action_resize(int arg);
-static int action_status(int arg);
-static int action_benchmark(int arg);
-static int action_luksFormat(int arg);
-static int action_luksOpen(int arg);
-static int action_luksAddKey(int arg);
-static int action_luksKillSlot(int arg);
-static int action_luksRemoveKey(int arg);
-static int action_luksChangeKey(int arg);
-static int action_isLuks(int arg);
-static int action_luksUUID(int arg);
-static int action_luksDump(int arg);
-static int action_luksSuspend(int arg);
-static int action_luksResume(int arg);
-static int action_luksBackup(int arg);
-static int action_luksRestore(int arg);
-static int action_loopaesOpen(int arg);
-static int action_luksRepair(int arg);
-static int action_tcryptOpen(int arg);
-
-static struct action_type {
- const char *type;
- int (*handler)(int);
- int arg;
- int required_action_argc;
- int required_memlock;
- const char *arg_desc;
- const char *desc;
-} action_types[] = {
- { "create", action_create, 0, 2, 1, N_("<name> <device>"),N_("create device") },
- { "remove", action_remove, 0, 1, 1, N_("<name>"), N_("remove device") },
- { "resize", action_resize, 0, 1, 1, N_("<name>"), N_("resize active device") },
- { "status", action_status, 0, 1, 0, N_("<name>"), N_("show device status") },
- { "benchmark", action_benchmark, 0, 0, 0, N_("<name>"), N_("benchmark cipher") },
- { "repair", action_luksRepair, 0, 1, 1, N_("<device>"), N_("try to repair on-disk metadata") },
- { "luksFormat", action_luksFormat, 0, 1, 1, N_("<device> [<new key file>]"), N_("formats a LUKS device") },
- { "luksOpen", action_luksOpen, 0, 2, 1, N_("<device> <name> "), N_("open LUKS device as mapping <name>") },
- { "luksAddKey", action_luksAddKey, 0, 1, 1, N_("<device> [<new key file>]"), N_("add key to LUKS device") },
- { "luksRemoveKey",action_luksRemoveKey, 0, 1, 1, N_("<device> [<key file>]"), N_("removes supplied key or key file from LUKS device") },
- { "luksChangeKey",action_luksChangeKey, 0, 1, 1, N_("<device> [<key file>]"), N_("changes supplied key or key file of LUKS device") },
- { "luksKillSlot", action_luksKillSlot, 0, 2, 1, N_("<device> <key slot>"), N_("wipes key with number <key slot> from LUKS device") },
- { "luksUUID", action_luksUUID, 0, 1, 0, N_("<device>"), N_("print UUID of LUKS device") },
- { "isLuks", action_isLuks, 0, 1, 0, N_("<device>"), N_("tests <device> for LUKS partition header") },
- { "luksClose", action_remove, 0, 1, 1, N_("<name>"), N_("remove LUKS mapping") },
- { "luksDump", action_luksDump, 0, 1, 1, N_("<device>"), N_("dump LUKS partition information") },
- { "luksSuspend",action_luksSuspend, 0, 1, 1, N_("<device>"), N_("Suspend LUKS device and wipe key (all IOs are frozen).") },
- { "luksResume", action_luksResume, 0, 1, 1, N_("<device>"), N_("Resume suspended LUKS device.") },
- { "luksHeaderBackup",action_luksBackup, 0, 1, 1, N_("<device>"), N_("Backup LUKS device header and keyslots") },
- { "luksHeaderRestore",action_luksRestore,0,1, 1, N_("<device>"), N_("Restore LUKS device header and keyslots") },
- { "loopaesOpen",action_loopaesOpen, 0, 2, 1, N_("<device> <name> "), N_("open loop-AES device as mapping <name>") },
- { "loopaesClose",action_remove, 0, 1, 1, N_("<name>"), N_("remove loop-AES mapping") },
- { "tcryptOpen", action_tcryptOpen, 0, 2, 1, N_("<device> <name> "), N_("open TCRYPT device as mapping <name>") },
- { NULL, NULL, 0, 0, 0, NULL, NULL }
-};
-
static int _verify_passphrase(int def)
{
/* Batch mode switch off verify - if not overrided by -y */
return def;
}
-static int action_create(int arg __attribute__((unused)))
+static int action_open_plain(void)
{
struct crypt_device *cd = NULL;
char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
goto out;
}
- if ((r = crypt_init(&cd, action_argv[1])))
+ if ((r = crypt_init(&cd, action_argv[0])))
goto out;
crypt_set_timeout(cd, opt_timeout);
if (opt_key_file)
/* With hashing, read the whole keyfile */
- r = crypt_activate_by_keyfile_offset(cd, action_argv[0],
+ r = crypt_activate_by_keyfile_offset(cd, action_argv[1],
CRYPT_ANY_SLOT, opt_key_file,
params.hash ? 0 : key_size, 0,
activate_flags);
if (r < 0)
goto out;
- r = crypt_activate_by_passphrase(cd, action_argv[0],
+ r = crypt_activate_by_passphrase(cd, action_argv[1],
CRYPT_ANY_SLOT, password, passwordLen, activate_flags);
}
out:
return r;
}
-static int action_loopaesOpen(int arg __attribute__((unused)))
+static int action_open_loopaes(void)
{
struct crypt_device *cd = NULL;
struct crypt_params_loopaes params = {
return r;
}
-static int action_tcryptOpen(int arg __attribute__((unused)))
+static int action_open_tcrypt(void)
{
struct crypt_device *cd = NULL;
struct crypt_params_tcrypt params = {
return r;
}
-static int action_remove(int arg __attribute__((unused)))
+static int tcryptDump_with_volume_key(struct crypt_device *cd)
+{
+ char *vk = NULL;
+ size_t vk_size;
+ unsigned i;
+ int r;
+
+ crypt_set_confirm_callback(cd, yesDialog, NULL);
+ if (!yesDialog(
+ _("Header dump with volume key is sensitive information\n"
+ "which allows access to encrypted partition without passphrase.\n"
+ "This dump should be always stored encrypted on safe place."),
+ NULL))
+ return -EPERM;
+
+ vk_size = crypt_get_volume_key_size(cd);
+ vk = crypt_safe_alloc(vk_size);
+ if (!vk)
+ return -ENOMEM;
+
+ r = crypt_volume_key_get(cd, CRYPT_ANY_SLOT, vk, &vk_size, NULL, 0);
+ if (r < 0)
+ goto out;
+
+ log_std("TCRYPT header information for %s\n", crypt_get_device_name(cd));
+ log_std("Cipher chain: \t%s\n", crypt_get_cipher(cd));
+ log_std("Cipher mode: \t%s\n", crypt_get_cipher_mode(cd));
+ log_std("Payload offset:\t%d\n", (int)crypt_get_data_offset(cd));
+ log_std("MK bits: \t%d\n", (int)vk_size * 8);
+ log_std("MK dump:\t");
+
+ for(i = 0; i < vk_size; i++) {
+ if (i && !(i % 16))
+ log_std("\n\t\t");
+ log_std("%02hhx ", (char)vk[i]);
+ }
+ log_std("\n");
+out:
+ crypt_safe_free(vk);
+ return r;
+}
+
+static int action_tcryptDump(void)
+{
+ struct crypt_device *cd = NULL;
+ struct crypt_params_tcrypt params = {
+ .keyfiles = opt_keyfiles,
+ .keyfiles_count = opt_keyfiles_count,
+ .flags = CRYPT_TCRYPT_LEGACY_MODES,
+ };
+ int r;
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ /* TCRYPT header is encrypted, get passphrase now */
+ r = crypt_get_key(_("Enter passphrase: "),
+ CONST_CAST(char**)¶ms.passphrase,
+ ¶ms.passphrase_size, 0, 0, NULL, opt_timeout,
+ _verify_passphrase(0), cd);
+ if (r < 0)
+ goto out;
+
+ if (opt_hidden)
+ params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
+
+ r = crypt_load(cd, CRYPT_TCRYPT, ¶ms);
+ if (r < 0)
+ goto out;
+
+ if (opt_dump_master_key)
+ r = tcryptDump_with_volume_key(cd);
+ else
+ r = crypt_dump(cd);
+out:
+ crypt_free(cd);
+ crypt_safe_free(CONST_CAST(char*)params.passphrase);
+ return r;
+}
+
+static int action_close(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_resize(int arg __attribute__((unused)))
+static int action_resize(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_status(int arg __attribute__((unused)))
+static int action_status(void)
{
crypt_status_info ci;
struct crypt_active_device cad;
return r;
}
-static int action_benchmark(int arg __attribute__((unused)))
+static int action_benchmark(void)
{
static struct {
char *cipher;
{ NULL, NULL, 0, 0 }
};
char *header = "# Tests are approximate using memory only (no storage IO).\n"
- "# Algorithm | Key | Encryption | Decryption\n";
+ "# Algorithm | Key | Encryption | Decryption\n";
char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
double enc_mbr = 0, dec_mbr = 0;
int key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS);
- int iv_size = 16;
+ int iv_size = 16, skipped = 0;
int buffer_size = 1024 * 1024;
char *c;
int i, r;
*c = '\0';
/* FIXME: not really clever :) */
- if (strstr(cipher, "des"))
+ if (strstr(cipher, "des") ||
+ strstr(cipher, "blowfish") ||
+ strstr(cipher, "cast5"))
iv_size = 8;
r = crypt_benchmark(NULL, cipher, cipher_mode,
log_std("%s", header);
strncat(cipher, "-", MAX_CIPHER_LEN);
strncat(cipher, cipher_mode, MAX_CIPHER_LEN);
- log_std("%11s %4db %5.1f MiB/s %5.1f MiB/s\n",
+ log_std("%12s %4db %5.1f MiB/s %5.1f MiB/s\n",
cipher, key_size, enc_mbr, dec_mbr);
- } else
- log_err(_("Cannot benchmark %s.\n"), cipher);
+ } else if (r == -ENOENT)
+ log_err(_("Cipher %s is not available.\n"), opt_cipher);
} else {
- log_std("%s", header);
for (i = 0; bciphers[i].cipher; i++) {
r = crypt_benchmark(NULL, bciphers[i].cipher, bciphers[i].mode,
bciphers[i].key_size, bciphers[i].iv_size,
buffer_size, &enc_mbr, &dec_mbr);
+ if (r == -ENOTSUP)
+ break;
+ if (r == -ENOENT)
+ skipped++;
+ if (i == 0)
+ log_std("%s", header);
+
snprintf(cipher, MAX_CIPHER_LEN, "%s-%s",
bciphers[i].cipher, bciphers[i].mode);
if (!r)
- log_std("%11s %4db %5.1f MiB/s %5.1f MiB/s\n",
+ log_std("%12s %4db %5.1f MiB/s %5.1f MiB/s\n",
cipher, bciphers[i].key_size*8, enc_mbr, dec_mbr);
else
- log_std("%11s %4db %12s %12s\n", cipher,
+ log_std("%12s %4db %12s %12s\n", cipher,
bciphers[i].key_size*8, _("N/A"), _("N/A"));
}
+ if (skipped && skipped == i)
+ r = -ENOTSUP;
}
+ if (r == -ENOTSUP)
+ log_err( _("Required kernel crypto interface not available.\n"
+ "Ensure you have algif_skcipher kernel module loaded.\n"));
return r;
}
return -EINVAL;
}
-static int action_luksRepair(int arg __attribute__((unused)))
+static int action_luksRepair(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksFormat(int arg __attribute__((unused)))
+static int action_luksFormat(void)
{
int r = -EINVAL, keysize;
const char *header_device;
return r;
}
-static int action_luksOpen(int arg __attribute__((unused)))
+static int action_open_luks(void)
{
struct crypt_device *cd = NULL;
const char *data_device, *header_device, *activated_name;
return r;
}
-static int action_luksKillSlot(int arg __attribute__((unused)))
+static int action_luksKillSlot(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksRemoveKey(int arg __attribute__((unused)))
+static int action_luksRemoveKey(void)
{
struct crypt_device *cd = NULL;
char *password = NULL;
return r;
}
-static int action_luksAddKey(int arg __attribute__((unused)))
+static int action_luksAddKey(void)
{
int r = -EINVAL, keysize = 0;
char *key = NULL;
return 1;
}
-static int action_luksChangeKey(int arg __attribute__((unused)))
+static int action_luksChangeKey(void)
{
const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
struct crypt_device *cd = NULL;
return r;
}
-static int action_isLuks(int arg __attribute__((unused)))
+static int action_isLuks(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksUUID(int arg __attribute__((unused)))
+static int action_luksUUID(void)
{
struct crypt_device *cd = NULL;
const char *existing_uuid = NULL;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if (!yesDialog(
- _("LUKS header dump with volume key is sensitive information\n"
+ _("Header dump with volume key is sensitive information\n"
"which allows access to encrypted partition without passphrase.\n"
"This dump should be always stored encrypted on safe place."),
NULL))
return r;
}
-static int action_luksDump(int arg __attribute__((unused)))
+static int action_luksDump(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksSuspend(int arg __attribute__((unused)))
+static int action_luksSuspend(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksResume(int arg __attribute__((unused)))
+static int action_luksResume(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksBackup(int arg __attribute__((unused)))
+static int action_luksBackup(void)
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksRestore(int arg __attribute__((unused)))
+static int action_luksRestore(void)
{
struct crypt_device *cd = NULL;
int r = 0;
return r;
}
+static int action_open(void)
+{
+ if (!opt_type)
+ return -EINVAL;
+
+ if (!strcmp(opt_type, "luks") || !strcmp(opt_type, "luks1")) {
+ if (action_argc < 2 && !opt_test_passphrase)
+ goto args;
+ return action_open_luks();
+ } else if (!strcmp(opt_type, "plain")) {
+ if (action_argc < 2)
+ goto args;
+ return action_open_plain();
+ } else if (!strcmp(opt_type, "loopaes")) {
+ if (action_argc < 2)
+ goto args;
+ return action_open_loopaes();
+ } else if (!strcmp(opt_type, "tcrypt")) {
+ if (action_argc < 2 && !opt_test_passphrase)
+ goto args;
+ return action_open_tcrypt();
+ }
+
+ log_err(_("Unrecognized metadata device type %s.\n"), opt_type);
+ return -EINVAL;
+args:
+ log_err(_("Command requires device and mapped name as arguments.\n"));
+ return -EINVAL;
+}
+
+static struct action_type {
+ const char *type;
+ int (*handler)(void);
+ int required_action_argc;
+ int required_memlock;
+ const char *arg_desc;
+ const char *desc;
+} action_types[] = {
+ { "open", action_open, 1, 1, N_("<device> [<name>]"),N_("open device as mapping <name>") },
+ { "close", action_close, 1, 1, N_("<name>"), N_("close device (remove mapping)") },
+ { "resize", action_resize, 1, 1, N_("<name>"), N_("resize active device") },
+ { "status", action_status, 1, 0, N_("<name>"), N_("show device status") },
+ { "benchmark", action_benchmark, 0, 0, N_("<name>"), N_("benchmark cipher") },
+ { "repair", action_luksRepair, 1, 1, N_("<device>"), N_("try to repair on-disk metadata") },
+ { "luksFormat", action_luksFormat, 1, 1, N_("<device> [<new key file>]"), N_("formats a LUKS device") },
+ { "luksAddKey", action_luksAddKey, 1, 1, N_("<device> [<new key file>]"), N_("add key to LUKS device") },
+ { "luksRemoveKey",action_luksRemoveKey,1, 1, N_("<device> [<key file>]"), N_("removes supplied key or key file from LUKS device") },
+ { "luksChangeKey",action_luksChangeKey,1, 1, N_("<device> [<key file>]"), N_("changes supplied key or key file of LUKS device") },
+ { "luksKillSlot", action_luksKillSlot, 2, 1, N_("<device> <key slot>"), N_("wipes key with number <key slot> from LUKS device") },
+ { "luksUUID", action_luksUUID, 1, 0, N_("<device>"), N_("print UUID of LUKS device") },
+ { "isLuks", action_isLuks, 1, 0, N_("<device>"), N_("tests <device> for LUKS partition header") },
+ { "luksDump", action_luksDump, 1, 1, N_("<device>"), N_("dump LUKS partition information") },
+ { "tcryptDump", action_tcryptDump, 1, 1, N_("<device>"), N_("dump TCRYPT device information") },
+ { "luksSuspend", action_luksSuspend, 1, 1, N_("<device>"), N_("Suspend LUKS device and wipe key (all IOs are frozen).") },
+ { "luksResume", action_luksResume, 1, 1, N_("<device>"), N_("Resume suspended LUKS device.") },
+ { "luksHeaderBackup", action_luksBackup,1,1, N_("<device>"), N_("Backup LUKS device header and keyslots") },
+ { "luksHeaderRestore",action_luksRestore,1,1,N_("<device>"), N_("Restore LUKS device header and keyslots") },
+ {}
+};
+
static void help(poptContext popt_context,
enum poptCallbackReason reason __attribute__((unused)),
struct poptOption *key,
"<key file> optional key file for the new key for luksAddKey action\n"),
crypt_get_dir());
- log_std(_("\nDefault compiled-in keyfile parameters:\n"
+ log_std(_("\nDefault compiled-in key and passphrase parameters:\n"
"\tMaximum keyfile size: %dkB, "
- "Maximum interactive passphrase length %d (characters)\n"),
- DEFAULT_KEYFILE_SIZE_MAXKB, DEFAULT_PASSPHRASE_SIZE_MAX);
+ "Maximum interactive passphrase length %d (characters)\n"
+ "Default PBKDF2 iteration time for LUKS: %d (ms)\n"),
+ DEFAULT_KEYFILE_SIZE_MAXKB, DEFAULT_PASSPHRASE_SIZE_MAX,
+ DEFAULT_LUKS1_ITER_TIME);
log_std(_("\nDefault compiled-in device cipher parameters:\n"
"\tloop-AES: %s, Key %d bits\n"
usage(popt_context, EXIT_SUCCESS, NULL, NULL);
}
+static void help_args(struct action_type *action, poptContext popt_context)
+{
+ char buf[128];
+
+ snprintf(buf, sizeof(buf), _("%s: requires %s as arguments"), action->type, action->arg_desc);
+ usage(popt_context, EXIT_FAILURE, buf, poptGetInvocationName(popt_context));
+}
+
static int run_action(struct action_type *action)
{
int r;
if (action->required_memlock)
crypt_memory_lock(NULL, 1);
- r = action->handler(action->arg);
+ r = action->handler();
if (action->required_memlock)
crypt_memory_lock(NULL, 0);
{ "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 },
{ "test-passphrase", '\0', POPT_ARG_NONE, &opt_test_passphrase, 0, N_("Do not activate device, just check passphrase."), NULL },
- { "hidden", '\0', POPT_ARG_NONE, &opt_hidden, 0, N_("Use hidden header (hiden TCRYPT device) ."), NULL },
+ { "hidden", '\0', POPT_ARG_NONE, &opt_hidden, 0, N_("Use hidden header (hidden TCRYPT device) ."), NULL },
+ { "type", 'M', POPT_ARG_STRING, &opt_type, 0, N_("Type of device metadata: luks, plain, loopaes, tcrypt."), NULL },
POPT_TABLEEND
};
poptContext popt_context;
if (!(aname = poptGetArg(popt_context)))
usage(popt_context, EXIT_FAILURE, _("Argument <action> missing."),
poptGetInvocationName(popt_context));
- for(action = action_types; action->type; action++)
- if (strcmp(action->type, aname) == 0)
- break;
- if (!action->type)
- usage(popt_context, EXIT_FAILURE, _("Unknown action."),
- poptGetInvocationName(popt_context));
action_argc = 0;
action_argv = poptGetArgs(popt_context);
while(action_argv[action_argc] != NULL)
action_argc++;
- if(action_argc < action->required_action_argc) {
- char buf[128];
- snprintf(buf, 128,_("%s: requires %s as arguments"), action->type, action->arg_desc);
- usage(popt_context, EXIT_FAILURE, buf,
- poptGetInvocationName(popt_context));
+ /* Handle aliases */
+ if (!strcmp(aname, "create")) {
+ /* create command had historically switched arguments */
+ if (action_argv[0] && action_argv[1]) {
+ const char *tmp = action_argv[0];
+ action_argv[0] = action_argv[1];
+ action_argv[1] = tmp;
+ }
+ aname = "open";
+ opt_type = "plain";
+ } else if (!strcmp(aname, "plainOpen")) {
+ aname = "open";
+ opt_type = "plain";
+ } else if (!strcmp(aname, "luksOpen")) {
+ aname = "open";
+ opt_type = "luks";
+ } else if (!strcmp(aname, "loopaesOpen")) {
+ aname = "open";
+ opt_type = "loopaes";
+ } else if (!strcmp(aname, "tcryptOpen")) {
+ aname = "open";
+ opt_type = "tcrypt";
+ } else if (!strcmp(aname, "remove") ||
+ !strcmp(aname, "plainClose") ||
+ !strcmp(aname, "luksClose") ||
+ !strcmp(aname, "loopaesClose") ||
+ !strcmp(aname, "tcryptClose")) {
+ aname = "close";
}
+ for(action = action_types; action->type; action++)
+ if (strcmp(action->type, aname) == 0)
+ break;
+
+ if (!action->type)
+ usage(popt_context, EXIT_FAILURE, _("Unknown action."),
+ poptGetInvocationName(popt_context));
+
+ if(action_argc < action->required_action_argc)
+ help_args(action, popt_context);
+
/* FIXME: rewrite this from scratch */
- if (opt_shared && strcmp(aname, "create"))
+ if (opt_shared && (strcmp(aname, "open") || strcmp(opt_type, "plain")) )
usage(popt_context, EXIT_FAILURE,
- _("Option --shared is allowed only for create operation.\n"),
+ _("Option --shared is allowed only for open of plain device.\n"),
poptGetInvocationName(popt_context));
- if (opt_allow_discards &&
- strcmp(aname, "luksOpen") &&
- strcmp(aname, "create") &&
- strcmp(aname, "loopaesOpen"))
+ if (opt_allow_discards && strcmp(aname, "open"))
usage(popt_context, EXIT_FAILURE,
- _("Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"),
+ _("Option --allow-discards is allowed only for open operation.\n"),
poptGetInvocationName(popt_context));
if (opt_key_size &&
strcmp(aname, "luksFormat") &&
- strcmp(aname, "create") &&
- strcmp(aname, "loopaesOpen") &&
+ strcmp(aname, "open") &&
strcmp(aname, "benchmark"))
usage(popt_context, EXIT_FAILURE,
- _("Option --key-size is allowed only for luksFormat, create, loopaesOpen and benchmark.\n"
+ _("Option --key-size is allowed only for luksFormat, open and benchmark.\n"
"To limit read from keyfile use --keyfile-size=(bytes)."),
poptGetInvocationName(popt_context));
- if (opt_test_passphrase &&
- strcmp(aname, "luksOpen") &&
- strcmp(aname, "tcryptOpen"))
+ if (opt_test_passphrase && (strcmp(aname, "open") ||
+ (strcmp(opt_type, "luks") && strcmp(opt_type, "tcrypt"))))
usage(popt_context, EXIT_FAILURE,
- _("Option --test-passphrase is allowed only for luksOpen and tcryptOpen.\n"),
+ _("Option --test-passphrase is allowed only for open of LUKS and TCRYPT devices.\n"),
poptGetInvocationName(popt_context));
if (opt_key_size % 8)
usage(popt_context, EXIT_FAILURE, _("Option --align-payload is allowed only for luksFormat."),
poptGetInvocationName(popt_context));
- if (opt_skip && strcmp(aname, "create") && strcmp(aname, "loopaesOpen"))
+ if (opt_skip && (strcmp(aname, "open") ||
+ (strcmp(opt_type, "plain") && strcmp(opt_type, "loopaes"))))
usage(popt_context, EXIT_FAILURE,
- _("Option --skip is supported only for create and loopaesOpen commands.\n"),
+ _("Option --skip is supported only for open of plain and loopaes devices.\n"),
poptGetInvocationName(popt_context));
- if (opt_offset && strcmp(aname, "create") && strcmp(aname, "loopaesOpen"))
+ if (opt_offset && (strcmp(aname, "open") ||
+ (strcmp(opt_type, "plain") && strcmp(opt_type, "loopaes"))))
usage(popt_context, EXIT_FAILURE,
- _("Option --offset is supported only for create and loopaesOpen commands.\n"),
+ _("Option --offset is supported only for open of plain and loopaes devices.\n"),
poptGetInvocationName(popt_context));
- if (opt_hidden && strcmp(aname, "tcryptOpen"))
+ if (opt_hidden && strcmp(aname, "tcryptDump") &&
+ (strcmp(aname, "open") || strcmp(opt_type, "tcrypt")))
usage(popt_context, EXIT_FAILURE,
- _("Option --hidden is supported only for tcryptOpen command.\n"),
+ _("Option --hidden is supported only for TCRYPT device.\n"),
poptGetInvocationName(popt_context));
if (opt_debug) {
projects / platform / upstream / cryptsetup.git / blobdiff