+/*
+ * cryptsetup - setup cryptographic volumes for dm-crypt
+ *
+ * Copyright (C) 2004, Christophe Saout <christophe@saout.de>
+ * Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
+ * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
static int opt_align_payload = 0;
static int opt_random = 0;
static int opt_urandom = 0;
+static int opt_dump_master_key = 0;
static const char **action_argv;
static int action_argc;
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_luksResume(int arg);
static int action_luksBackup(int arg);
static int action_luksRestore(int arg);
+static int action_loopaesOpen(int arg);
static struct action_type {
const char *type;
{ "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") },
{ "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") },
{ NULL, NULL, 0, 0, 0, NULL, NULL }
};
};
char *password = NULL;
unsigned int passwordLen;
+ unsigned int key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS) / 8;
int r;
if (params.hash && !strcmp(params.hash, "plain"))
params.hash = NULL;
+ /* FIXME: temporary hack */
+ if (opt_key_file && strcmp(opt_key_file, "-"))
+ params.hash = NULL;
+
r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(PLAIN),
- cipher, cipher_mode);
+ cipher, NULL, cipher_mode);
if (r < 0) {
log_err("No known cipher specification pattern detected.\n");
goto out;
r = crypt_format(cd, CRYPT_PLAIN,
cipher, cipher_mode,
NULL, NULL,
- (opt_key_size ?: DEFAULT_PLAIN_KEYBITS) / 8,
+ key_size,
¶ms);
if (r < 0)
goto out;
- crypt_get_key(_("Enter passphrase: "),
- &password, &passwordLen,
- opt_keyfile_size, opt_key_file,
- opt_timeout,
- opt_batch_mode ? 0 : opt_verify_passphrase,
- cd);
+ if (opt_key_file)
+ r = crypt_activate_by_keyfile(cd, action_argv[0],
+ CRYPT_ANY_SLOT, opt_key_file, key_size,
+ opt_readonly ? CRYPT_ACTIVATE_READONLY : 0);
+ else {
+ r = crypt_get_key(_("Enter passphrase: "),
+ &password, &passwordLen, 0, NULL,
+ opt_timeout,
+ opt_batch_mode ? 0 : opt_verify_passphrase,
+ cd);
+ if (r < 0)
+ goto out;
- r = crypt_activate_by_passphrase(cd, action_argv[0], CRYPT_ANY_SLOT,
- password, passwordLen,
- opt_readonly ? CRYPT_ACTIVATE_READONLY : 0);
+ r = crypt_activate_by_passphrase(cd, action_argv[0],
+ CRYPT_ANY_SLOT, password, passwordLen,
+ opt_readonly ? CRYPT_ACTIVATE_READONLY : 0);
+ }
out:
crypt_free(cd);
crypt_safe_free(password);
- return (r < 0) ? r : 0;
+ return r;
+}
+
+static int action_loopaesOpen(int arg)
+{
+ struct crypt_device *cd = NULL;
+ struct crypt_params_loopaes params = {
+ .hash = opt_hash ?: NULL, // FIXME
+ .offset = opt_offset,
+ };
+ unsigned int key_size = (opt_key_size ?: DEFAULT_LOOPAES_KEYBITS) / 8;
+ int r;
+
+ if (!opt_key_file) {
+ log_err(_("Option --key-file is required.\n"));
+ return -EINVAL;
+ }
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ r = crypt_format(cd, CRYPT_LOOPAES, opt_cipher ?: DEFAULT_LOOPAES_CIPHER,
+ NULL, NULL, NULL, key_size, ¶ms);
+ if (r < 0)
+ goto out;
+
+ r = crypt_activate_by_keyfile(cd, action_argv[1],
+ CRYPT_ANY_SLOT, opt_key_file, 0,
+ opt_readonly ? CRYPT_ACTIVATE_READONLY : 0);
+out:
+ crypt_free(cd);
+
+ return r;
}
static int action_remove(int arg)
crypt_status_info ci;
struct crypt_active_device cad;
struct crypt_device *cd = NULL;
+ char *backing_file;
+ const char *device;
int r = 0;
ci = crypt_status(NULL, action_argv[0]);
if (r < 0 || !crypt_get_type(cd))
goto out;
- log_std(" type: %s\n", crypt_get_type(cd));
+ log_std(" type: %s\n", crypt_get_type(cd));
r = crypt_get_active_device(cd, action_argv[0], &cad);
if (r < 0)
log_std(" cipher: %s-%s\n", crypt_get_cipher(cd), crypt_get_cipher_mode(cd));
log_std(" keysize: %d bits\n", crypt_get_volume_key_size(cd) * 8);
- log_std(" device: %s\n", crypt_get_device_name(cd));
+ device = crypt_get_device_name(cd);
+ log_std(" device: %s\n", device);
+ if (crypt_loop_device(device)) {
+ backing_file = crypt_loop_backing_file(device);
+ log_std(" loop: %s\n", backing_file);
+ free(backing_file);
+ }
log_std(" offset: %" PRIu64 " sectors\n", cad.offset);
log_std(" size: %" PRIu64 " sectors\n", cad.size);
if (cad.iv_offset)
goto out;
r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(LUKS1),
- cipher, cipher_mode);
+ cipher, NULL, cipher_mode);
if (r < 0) {
log_err("No known cipher specification pattern detected.\n");
goto out;
else if (opt_urandom)
crypt_set_rng_type(cd, CRYPT_RNG_URANDOM);
- r = -EINVAL;
- crypt_get_key(_("Enter LUKS passphrase: "),
- &password, &passwordLen,
- opt_keyfile_size, opt_key_file,
- opt_timeout,
- opt_batch_mode ? 0 : 1, /* always verify */
- cd);
- if(!password)
+ r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
+ opt_keyfile_size, opt_key_file, opt_timeout,
+ opt_batch_mode ? 0 : 1 /* always verify */, cd);
+ if (r < 0)
goto out;
if (opt_master_key_file) {
crypt_safe_free(key);
crypt_safe_free(password);
- return (r < 0) ? r : 0;
+ return r;
}
static int action_luksOpen(int arg)
CRYPT_ANY_SLOT, NULL, 0, flags);
out:
crypt_free(cd);
- return (r < 0) ? r : 0;
+ return r;
}
static int verify_keyslot(struct crypt_device *cd, int key_slot,
crypt_keyslot_info ki;
char *password = NULL;
unsigned int passwordLen, i;
- int r = -EPERM;
+ int r;
ki = crypt_keyslot_status(cd, key_slot);
if (ki == CRYPT_SLOT_ACTIVE_LAST && msg_last && !_yesDialog(msg_last, NULL))
return -EPERM;
- crypt_get_key(msg_pass, &password, &passwordLen,
- keyfile_size, key_file,
- opt_timeout,
- opt_batch_mode ? 0 : opt_verify_passphrase,
- cd);
- if(!password)
- return -EINVAL;
+ r = crypt_get_key(msg_pass, &password, &passwordLen,
+ keyfile_size, key_file, opt_timeout,
+ opt_batch_mode ? 0 : opt_verify_passphrase, cd);
+ if(r < 0)
+ goto out;
if (ki == CRYPT_SLOT_ACTIVE_LAST) {
/* check the last keyslot */
if (r < 0)
log_err(_("No key available with this passphrase.\n"));
-
+out:
crypt_safe_free(password);
return r;
}
r = crypt_keyslot_destroy(cd, opt_key_slot);
out:
crypt_free(cd);
-
- return (r < 0) ? r : 0;
+ return r;
}
static int action_luksRemoveKey(int arg)
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out;
- crypt_get_key(_("Enter LUKS passphrase to be deleted: "),
+ r = crypt_get_key(_("Enter LUKS passphrase to be deleted: "),
&password, &passwordLen,
opt_keyfile_size, opt_key_file,
opt_timeout,
opt_batch_mode ? 0 : opt_verify_passphrase,
cd);
- if(!password) {
- r = -EINVAL;
+ if(r < 0)
goto out;
- }
r = crypt_activate_by_passphrase(cd, NULL, CRYPT_ANY_SLOT,
password, passwordLen, 0);
out:
crypt_safe_free(password);
crypt_free(cd);
-
- return (r < 0) ? r : 0;
+ return r;
}
static int action_luksAddKey(int arg)
crypt_set_iterarion_time(cd, opt_iteration_time);
if (opt_master_key_file) {
- if (_read_mk(opt_master_key_file, &key, keysize) < 0)
+ r = _read_mk(opt_master_key_file, &key, keysize);
+ if (r < 0)
goto out;
-
+ //FIXME: process keyfile arg
r = crypt_keyslot_add_by_volume_key(cd, opt_key_slot,
key, keysize, NULL, 0);
} else if (opt_key_file || opt_new_key_file) {
out:
crypt_free(cd);
crypt_safe_free(key);
+ return r;
+}
+
+static int _slots_full(struct crypt_device *cd)
+{
+ int i;
+
+ for (i = 0; i < crypt_keyslot_max(crypt_get_type(cd)); i++)
+ if (crypt_keyslot_status(cd, i) == CRYPT_SLOT_INACTIVE)
+ return 0;
+ return 1;
+}
- return (r < 0) ? r : 0;
+static int action_luksChangeKey(int arg)
+{
+ const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
+ struct crypt_device *cd = NULL;
+ char *vk = NULL, *password = NULL;
+ unsigned int passwordLen = 0;
+ size_t vk_size;
+ int new_key_slot, old_key_slot, r;
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
+ goto out;
+
+ if (opt_iteration_time)
+ crypt_set_iterarion_time(cd, opt_iteration_time);
+
+ r = crypt_get_key(_("Enter LUKS passphrase to be changed: "),
+ &password, &passwordLen,
+ opt_keyfile_size, opt_key_file, opt_timeout,
+ opt_batch_mode ? 0 : opt_verify_passphrase, cd);
+ if (r < 0)
+ goto out;
+
+ vk_size = crypt_get_volume_key_size(cd);
+ vk = crypt_safe_alloc(vk_size);
+ if (!vk) {
+ r = -ENOMEM;
+ goto out;
+ }
+
+ r = crypt_volume_key_get(cd, opt_key_slot, vk, &vk_size,
+ password, passwordLen);
+ if (r < 0) {
+ if (opt_key_slot != CRYPT_ANY_SLOT)
+ log_err(_("No key available with this passphrase.\n"));
+ goto out;
+ }
+
+ if (opt_key_slot != CRYPT_ANY_SLOT || _slots_full(cd)) {
+ log_dbg("Key slot %d is going to be overwritten (%s).",
+ r, opt_key_slot != CRYPT_ANY_SLOT ?
+ "explicit key slot specified" : "no free key slot");
+ old_key_slot = r;
+ new_key_slot = r;
+ } else {
+ log_dbg("Allocating new key slot.");
+ old_key_slot = r;
+ new_key_slot = CRYPT_ANY_SLOT;
+ }
+
+ crypt_safe_free(password);
+ password = NULL;
+ passwordLen = 0;
+ r = crypt_get_key(_("Enter new LUKS passphrase: "),
+ &password, &passwordLen,
+ opt_new_keyfile_size, opt_new_key_file,
+ opt_timeout, opt_batch_mode ? 0 : 1, cd);
+ if (r < 0)
+ goto out;
+
+ if (new_key_slot == old_key_slot) {
+ (void)crypt_keyslot_destroy(cd, old_key_slot);
+ r = crypt_keyslot_add_by_volume_key(cd, new_key_slot,
+ vk, vk_size,
+ password, passwordLen);
+ if (r >= 0)
+ log_verbose(_("Key slot %d changed.\n"), r);
+ } else {
+ r = crypt_keyslot_add_by_volume_key(cd, CRYPT_ANY_SLOT,
+ vk, vk_size,
+ password, passwordLen);
+ if (r >= 0) {
+ log_verbose(_("Replaced with key slot %d.\n"), r);
+ r = crypt_keyslot_destroy(cd, old_key_slot);
+ }
+ }
+ if (r < 0)
+ log_err(_("Failed to swap new key slot.\n"));
+out:
+ crypt_safe_free(vk);
+ crypt_safe_free(password);
+ crypt_free(cd);
+ return r;
}
static int action_isLuks(int arg)
out:
crypt_free(cd);
return r;
+}
+
+static int luksDump_with_volume_key(struct crypt_device *cd)
+{
+ char *vk = NULL, *password = NULL;
+ unsigned int passwordLen = 0;
+ size_t vk_size;
+ int i, r;
+
+ crypt_set_confirm_callback(cd, _yesDialog, NULL);
+ if (!_yesDialog(
+ _("LUKS 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_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
+ opt_keyfile_size, opt_key_file, opt_timeout, 0, cd);
+ if (r < 0)
+ goto out;
+ r = crypt_volume_key_get(cd, CRYPT_ANY_SLOT, vk, &vk_size,
+ password, passwordLen);
+ if (r < 0)
+ goto out;
+
+ log_std("LUKS header information for %s\n", crypt_get_device_name(cd));
+ log_std("Cipher name: \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", crypt_get_data_offset(cd));
+ log_std("UUID: \t%s\n", crypt_get_uuid(cd));
+ log_std("MK bits: \t%d\n", 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(password);
+ crypt_safe_free(vk);
+ return r;
}
static int action_luksDump(int arg)
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out;
- r = crypt_dump(cd);
+ if (opt_dump_master_key)
+ r = luksDump_with_volume_key(cd);
+ else
+ r = crypt_dump(cd);
out:
crypt_free(cd);
return r;
return r;
}
-static void usage(poptContext popt_context, int exitcode,
- const char *error, const char *more)
+static __attribute__ ((noreturn)) void usage(poptContext popt_context,
+ int exitcode, const char *error,
+ const char *more)
{
poptPrintUsage(popt_context, stderr, 0);
if (error)
for(action = action_types; action->type; action++)
log_std("\t%s %s - %s\n", action->type, _(action->arg_desc), _(action->desc));
-
+
log_std(_("\n"
"<name> is the device to create under %s\n"
"<device> is the encrypted device\n"
crypt_get_dir());
log_std(_("\nDefault compiled-in device cipher parameters:\n"
+ "\tloop-AES: %s, Key %d bits\n"
"\tplain: %s, Key: %d bits, Password hashing: %s\n"
"\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"),
+ DEFAULT_LOOPAES_CIPHER, DEFAULT_LOOPAES_KEYBITS,
DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH,
DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH,
DEFAULT_RNG);
- exit(0);
+ exit(EXIT_SUCCESS);
} else
- usage(popt_context, 0, NULL, NULL);
+ usage(popt_context, EXIT_SUCCESS, NULL, NULL);
}
-void set_debug_level(int level);
-
static void _dbg_version_and_cmd(int argc, char **argv)
{
int i;
{
int r;
+ log_dbg("Running command %s.", action->type);
+
if (action->required_memlock)
crypt_memory_lock(NULL, 1);
if (action->required_memlock)
crypt_memory_lock(NULL, 0);
+ /* Some functions returns keyslot # */
+ if (r > 0)
+ r = 0;
+
show_status(r);
+ /* Translate exit code to simple codes */
+ switch (r) {
+ case 0: r = EXIT_SUCCESS; break;
+ case -EEXIST:
+ case -EBUSY: r = 5; break;
+ case -ENOTBLK:
+ case -ENODEV: r = 4; break;
+ case -ENOMEM: r = 3; break;
+ case -EPERM: r = 2; break;
+ case -EINVAL:
+ case -ENOENT:
+ case -ENOSYS:
+ default: r = EXIT_FAILURE;
+ }
return r;
}
};
static struct poptOption popt_options[] = {
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, popt_help_options, 0, N_("Help options:"), NULL },
+ { "version", '\0', POPT_ARG_NONE, &opt_version_mode, 0, N_("Print package version"), NULL },
{ "verbose", 'v', POPT_ARG_NONE, &opt_verbose, 0, N_("Shows more detailed error messages"), NULL },
{ "debug", '\0', POPT_ARG_NONE, &opt_debug, 0, N_("Show debug messages"), NULL },
{ "cipher", 'c', POPT_ARG_STRING, &opt_cipher, 0, N_("The cipher used to encrypt the disk (see /proc/crypto)"), NULL },
{ "verify-passphrase", 'y', POPT_ARG_NONE, &opt_verify_passphrase, 0, N_("Verifies the passphrase by asking for it twice"), NULL },
{ "key-file", 'd', POPT_ARG_STRING, &opt_key_file, 0, N_("Read the key from a file."), NULL },
{ "master-key-file", '\0', POPT_ARG_STRING, &opt_master_key_file, 0, N_("Read the volume (master) key from file."), NULL },
+ { "dump-master-key", '\0', POPT_ARG_NONE, &opt_dump_master_key, 0, N_("Dump volume (master) key instead of keyslots info."), NULL },
{ "key-size", 's', POPT_ARG_INT, &opt_key_size, 0, N_("The size of the encryption key"), N_("BITS") },
{ "keyfile-size", 'l', POPT_ARG_INT, &opt_keyfile_size, 0, N_("Limits the read from keyfile"), N_("bytes") },
{ "new-keyfile-size", '\0', POPT_ARG_INT, &opt_new_keyfile_size, 0, N_("Limits the read from newly added keyfile"), N_("bytes") },
{ "readonly", 'r', POPT_ARG_NONE, &opt_readonly, 0, N_("Create a readonly mapping"), NULL },
{ "iter-time", 'i', POPT_ARG_INT, &opt_iteration_time, 0, N_("PBKDF2 iteration time for LUKS (in ms)"), N_("msecs") },
{ "batch-mode", 'q', POPT_ARG_NONE, &opt_batch_mode, 0, N_("Do not ask for confirmation"), NULL },
- { "version", '\0', POPT_ARG_NONE, &opt_version_mode, 0, N_("Print package version"), NULL },
{ "timeout", 't', POPT_ARG_INT, &opt_timeout, 0, N_("Timeout for interactive passphrase prompt (in seconds)"), N_("secs") },
{ "tries", 'T', POPT_ARG_INT, &opt_tries, 0, N_("How often the input of the passphrase can be retried"), NULL },
{ "align-payload", '\0', POPT_ARG_INT, &opt_align_payload, 0, N_("Align payload at <n> sector boundaries - for luksFormat"), N_("SECTORS") },
}
if (r < -1)
- usage(popt_context, 1, poptStrerror(r),
+ usage(popt_context, EXIT_FAILURE, poptStrerror(r),
poptBadOption(popt_context, POPT_BADOPTION_NOALIAS));
if (opt_version_mode) {
log_std("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
- exit(0);
+ exit(EXIT_SUCCESS);
}
if (!(aname = (char *)poptGetArg(popt_context)))
- usage(popt_context,
1, _("Argument <action> missing."),
+ 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, 1, _("Unknown action."),
+ usage(popt_context, EXIT_FAILURE, _("Unknown action."),
poptGetInvocationName(popt_context));
action_argc = 0;
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, 1, buf,
+ usage(popt_context, EXIT_FAILURE, buf,
poptGetInvocationName(popt_context));
}
if (opt_key_size &&
strcmp(aname, "luksFormat") &&
- strcmp(aname, "create")) {
- usage(popt_context, 1,
- _("Option --key-size is allowed only for luksFormat and create.\n"
+ strcmp(aname, "create") &&
+ 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_key_size % 8)
- usage(popt_context, 1,
+ usage(popt_context, EXIT_FAILURE,
_("Key size must be a multiple of 8 bits"),
poptGetInvocationName(popt_context));
- if (!strcmp(aname, "luksKillSlot"))
+ if (!strcmp(aname, "luksKillSlot") && action_argc > 1)
opt_key_slot = atoi(action_argv[1]);
if (opt_key_slot != CRYPT_ANY_SLOT &&
(opt_key_slot < 0 || opt_key_slot > crypt_keyslot_max(CRYPT_LUKS1)))
- usage(popt_context, 1, _("Key slot is invalid."),
+ usage(popt_context, EXIT_FAILURE, _("Key slot is invalid."),
poptGetInvocationName(popt_context));
if ((!strcmp(aname, "luksRemoveKey") ||
}
if (opt_random && opt_urandom)
- usage(popt_context, 1, _("Only one of --use-[u]random options is allowed."),
+ usage(popt_context, EXIT_FAILURE, _("Only one of --use-[u]random options is allowed."),
poptGetInvocationName(popt_context));
if ((opt_random || opt_urandom) && strcmp(aname, "luksFormat"))
- usage(popt_context, 1, _("Option --use-[u]random is allowed only for luksFormat."),
+ usage(popt_context, EXIT_FAILURE, _("Option --use-[u]random is allowed only for luksFormat."),
poptGetInvocationName(popt_context));
if (opt_uuid && strcmp(aname, "luksFormat") && strcmp(aname, "luksUUID"))
- usage(popt_context, 1, _("Option --uuid is allowed only for luksFormat and luksUUID."),
+ usage(popt_context, EXIT_FAILURE, _("Option --uuid is allowed only for luksFormat and luksUUID."),
poptGetInvocationName(popt_context));
if ((opt_offset || opt_skip) && strcmp(aname, "create"))
- usage(popt_context, 1, _("Options --offset and --skip are supported only for create command.\n"),
+ usage(popt_context, EXIT_FAILURE, _("Options --offset and --skip are supported only for create command.\n"),
poptGetInvocationName(popt_context));
if (opt_debug) {
projects / platform / upstream / cryptsetup.git / blobdiff