+/*
+ * 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>
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
-
#include <libcryptsetup.h>
#include <popt.h>
-#include "../config.h"
-
#include "cryptsetup.h"
static int opt_verbose = 0;
static int opt_debug = 0;
-static char *opt_cipher = NULL;
-static char *opt_hash = NULL;
+static const char *opt_cipher = NULL;
+static const char *opt_hash = NULL;
static int opt_verify_passphrase = 0;
-static char *opt_key_file = NULL;
-static char *opt_master_key_file = NULL;
-static char *opt_header_backup_file = NULL;
-static char *opt_uuid = NULL;
-static unsigned int opt_key_size = 0;
-static unsigned int opt_keyfile_size = 0;
-static unsigned int opt_new_keyfile_size = 0;
+static const char *opt_key_file = NULL;
+static const char *opt_master_key_file = NULL;
+static const char *opt_header_backup_file = NULL;
+static const char *opt_uuid = NULL;
+static int opt_key_size = 0;
+static long opt_keyfile_size = 0;
+static long opt_new_keyfile_size = 0;
static int opt_key_slot = CRYPT_ANY_SLOT;
static uint64_t opt_size = 0;
static uint64_t opt_offset = 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_batch_mode = 0;
static int opt_random = 0;
static int opt_urandom = 0;
static int opt_dump_master_key = 0;
+static int opt_shared = 0;
+static int opt_allow_discards = 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") },
{ "luksClose", action_remove, 0, 1, 1, N_("<name>"), N_("remove LUKS mapping") },
- { "luksDump", action_luksDump, 0, 1, 0, N_("<device>"), N_("dump LUKS partition information") },
+ { "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") },
{ NULL, NULL, 0, 0, 0, NULL, NULL }
};
+__attribute__((format(printf, 5, 6)))
static void clogger(struct crypt_device *cd, int level, const char *file,
int line, const char *format, ...)
{
free(target);
}
-static int _yesDialog(const char *msg, void *usrptr)
+static int _yesDialog(const char *msg, void *usrptr __attribute__((unused)))
{
char *answer = NULL;
size_t size = 0;
return r;
}
-static void _log(int level, const char *msg, void *usrptr)
+static void _log(int level, const char *msg, void *usrptr __attribute__((unused)))
{
switch(level) {
case CRYPT_LOG_ERROR:
fputs(msg, stderr);
break;
+ case CRYPT_LOG_DEBUG:
+ if (opt_debug)
+ printf("# %s\n", msg);
+ break;
default:
fprintf(stderr, "Internal error on logging class for msg: %s", msg);
break;
log_err(".\n");
}
-static int action_create(int arg)
+static int action_create(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
.hash = opt_hash ?: DEFAULT_PLAIN_HASH,
.skip = opt_skip,
.offset = opt_offset,
+ .size = opt_size,
};
char *password = NULL;
- unsigned int passwordLen;
+ size_t passwordLen;
+ size_t key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS) / 8;
+ uint32_t activate_flags = 0;
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;
+
+ if (opt_keyfile_size && opt_key_file)
+ log_std(("Ignoring keyfile size option, keyfile read size "
+ "is always the same as encryption key size.\n"));
+
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;
- r = 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_readonly)
+ activate_flags |= CRYPT_ACTIVATE_READONLY;
+
+ if (opt_shared)
+ activate_flags |= CRYPT_ACTIVATE_SHARED;
+
+ if (opt_allow_discards)
+ activate_flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
+
+ if (opt_key_file)
+ /* With hashing, read the whole keyfile */
+ r = crypt_activate_by_keyfile(cd, action_argv[0],
+ CRYPT_ANY_SLOT, opt_key_file, params.hash ? 0 : key_size,
+ activate_flags);
+ else {
+ r = crypt_get_key(_("Enter passphrase: "),
+ &password, &passwordLen, opt_keyfile_size,
+ 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, activate_flags);
+ }
+out:
+ crypt_free(cd);
+ crypt_safe_free(password);
+
+ return r;
+}
+
+static int action_loopaesOpen(int arg __attribute__((unused)))
+{
+ struct crypt_device *cd = NULL;
+ struct crypt_params_loopaes params = {
+ .hash = opt_hash ?: NULL,
+ .offset = opt_offset,
+ .skip = opt_skip_valid ? opt_skip : opt_offset,
+ };
+ unsigned int key_size = (opt_key_size ?: DEFAULT_LOOPAES_KEYBITS) / 8;
+ uint32_t activate_flags = 0;
+ int r;
+
+ if (!opt_key_file) {
+ log_err(_("Option --key-file is required.\n"));
+ return -EINVAL;
+ }
+
+ if (opt_readonly)
+ activate_flags |= CRYPT_ACTIVATE_READONLY;
+
+ if (opt_allow_discards)
+ activate_flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
+
+ 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_passphrase(cd, action_argv[0], CRYPT_ANY_SLOT,
- password, passwordLen,
- opt_readonly ? CRYPT_ACTIVATE_READONLY : 0);
+ r = crypt_activate_by_keyfile(cd, action_argv[1], CRYPT_ANY_SLOT,
+ opt_key_file, opt_keyfile_size, activate_flags);
out:
crypt_free(cd);
- crypt_safe_free(password);
return r;
}
-static int action_remove(int arg)
+static int action_remove(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_resize(int arg)
+static int action_resize(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_status(int arg)
+static int action_status(int arg __attribute__((unused)))
{
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]);
switch (ci) {
case CRYPT_INVALID:
- r = -ENODEV;
+ r = -EINVAL;
break;
case CRYPT_INACTIVE:
log_std("%s/%s is inactive.\n", crypt_get_dir(), action_argv[0]);
+ r = -ENODEV;
break;
case CRYPT_ACTIVE:
case CRYPT_BUSY:
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)
log_std(" skipped: %" PRIu64 " sectors\n", cad.iv_offset);
log_std(" mode: %s\n", cad.flags & CRYPT_ACTIVATE_READONLY ?
"readonly" : "read/write");
+ if (cad.flags & CRYPT_ACTIVATE_ALLOW_DISCARDS)
+ log_std(" flags: discards\n");
}
out:
crypt_free(cd);
return -EINVAL;
}
-static int action_luksFormat(int arg)
+static int action_luksFormat(int arg __attribute__((unused)))
{
int r = -EINVAL, keysize;
char *msg = NULL, *key = NULL, cipher [MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
char *password = NULL;
- unsigned int passwordLen;
+ size_t passwordLen;
struct crypt_device *cd = NULL;
struct crypt_params_luks1 params = {
.hash = opt_hash ?: DEFAULT_LUKS1_HASH,
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;
return r;
}
-static int action_luksOpen(int arg)
+static int action_luksOpen(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
uint32_t flags = 0;
if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time);
+
if (opt_readonly)
flags |= CRYPT_ACTIVATE_READONLY;
+ if (opt_allow_discards)
+ flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
+
if (opt_key_file) {
crypt_set_password_retry(cd, 1);
r = crypt_activate_by_keyfile(cd, action_argv[1],
{
crypt_keyslot_info ki;
char *password = NULL;
- unsigned int passwordLen, i;
- int r;
+ size_t passwordLen;
+ int i, r;
ki = crypt_keyslot_status(cd, key_slot);
if (ki == CRYPT_SLOT_ACTIVE_LAST && msg_last && !_yesDialog(msg_last, NULL))
return r;
}
-static int action_luksKillSlot(int arg)
+static int action_luksKillSlot(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksRemoveKey(int arg)
+static int action_luksRemoveKey(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
char *password = NULL;
- unsigned int passwordLen;
+ size_t passwordLen;
int r;
if ((r = crypt_init(&cd, action_argv[0])))
return r;
}
-static int action_luksAddKey(int arg)
+static int action_luksAddKey(int arg __attribute__((unused)))
{
int r = -EINVAL, keysize = 0;
char *key = NULL;
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) {
return r;
}
-static int action_isLuks(int arg)
+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;
+}
+
+static int action_luksChangeKey(int arg __attribute__((unused)))
+{
+ const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
+ struct crypt_device *cd = NULL;
+ char *vk = NULL, *password = NULL;
+ size_t 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 __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksUUID(int arg)
+static int action_luksUUID(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
const char *existing_uuid = NULL;
static int luksDump_with_volume_key(struct crypt_device *cd)
{
char *vk = NULL, *password = NULL;
- unsigned int passwordLen = 0;
+ size_t passwordLen = 0;
size_t vk_size;
- int i, r;
+ unsigned i;
+ int r;
crypt_set_confirm_callback(cd, _yesDialog, NULL);
if (!_yesDialog(
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("Payload offset:\t%d\n", (int)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 bits: \t%d\n", (int)vk_size * 8);
log_std("MK dump:\t");
for(i = 0; i < vk_size; i++) {
return r;
}
-static int action_luksDump(int arg)
+static int action_luksDump(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksSuspend(int arg)
+static int action_luksSuspend(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksResume(int arg)
+static int action_luksResume(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksBackup(int arg)
+static int action_luksBackup(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r;
return r;
}
-static int action_luksRestore(int arg)
+static int action_luksRestore(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
int r = 0;
exit(exitcode);
}
-static void help(poptContext popt_context, enum poptCallbackReason reason,
- struct poptOption *key, const char * arg, void *data)
+static void help(poptContext popt_context,
+ enum poptCallbackReason reason __attribute__((unused)),
+ struct poptOption *key,
+ const char *arg __attribute__((unused)),
+ void *data __attribute__((unused)))
{
if (key->shortName == '?') {
struct action_type *action;
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"
"<key file> optional key file for the new key for luksAddKey action\n"),
crypt_get_dir());
+ log_std(_("\nDefault compiled-in keyfile parameters:\n"
+ "\tMaximum keyfile size: %dkB, "
+ "Maximum interactive passphrase length %d (characters)\n"),
+ DEFAULT_KEYFILE_SIZE_MAXKB, DEFAULT_PASSPHRASE_SIZE_MAX);
+
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);
usage(popt_context, EXIT_SUCCESS, NULL, NULL);
}
-void set_debug_level(int level);
-
-static void _dbg_version_and_cmd(int argc, char **argv)
+static void _dbg_version_and_cmd(int argc, const char **argv)
{
int i;
for (i = 0; i < argc; i++) {
if (i)
log_std(" ");
- log_std(argv[i]);
+ log_std("%s", argv[i]);
}
log_std("\"\n");
}
{
int r;
+ log_dbg("Running command %s.", action->type);
+
if (action->required_memlock)
crypt_memory_lock(NULL, 1);
return r;
}
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
static char *popt_tmp;
static struct poptOption popt_help_options[] = {
{ "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") },
+ { "keyfile-size", 'l', POPT_ARG_LONG, &opt_keyfile_size, 0, N_("Limits the read from keyfile"), N_("bytes") },
+ { "new-keyfile-size", '\0', POPT_ARG_LONG, &opt_new_keyfile_size, 0, N_("Limits the read from newly added keyfile"), N_("bytes") },
{ "key-slot", 'S', POPT_ARG_INT, &opt_key_slot, 0, N_("Slot number for new key (default is first free)"), NULL },
{ "size", 'b', POPT_ARG_STRING, &popt_tmp, 1, N_("The size of the device"), N_("SECTORS") },
{ "offset", 'o', POPT_ARG_STRING, &popt_tmp, 2, N_("The start offset in the backend device"), N_("SECTORS") },
{ "header-backup-file",'\0', POPT_ARG_STRING, &opt_header_backup_file, 0, N_("File with LUKS header and keyslots backup."), NULL },
{ "use-random", '\0', POPT_ARG_NONE, &opt_random, 0, N_("Use /dev/random for generating volume key."), NULL },
{ "use-urandom", '\0', POPT_ARG_NONE, &opt_urandom, 0, N_("Use /dev/urandom for generating volume key."), NULL },
- { "uuid", '\0', POPT_ARG_STRING, &opt_uuid, 0, N_("UUID for device to use."), NULL },
+ { "shared", '\0', POPT_ARG_NONE, &opt_shared, 0, N_("Share device with another non-overlapping crypt segment."), NULL },
+ { "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 },
POPT_TABLEEND
};
poptContext popt_context;
struct action_type *action;
- char *aname;
+ const char *aname;
int r;
const char *null_action_argv[] = {NULL};
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
- popt_context = poptGetContext(PACKAGE, argc, (const char **)argv,
- popt_options, 0);
+ popt_context = poptGetContext(PACKAGE, argc, argv, popt_options, 0);
poptSetOtherOptionHelp(popt_context,
N_("[OPTION...] <action> <action-specific>]"));
break;
case 3:
opt_skip = ull_value;
+ opt_skip_valid = 1;
break;
}
exit(EXIT_SUCCESS);
}
- if (!(aname = (char *)poptGetArg(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++)
/* FIXME: rewrite this from scratch */
+ 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")) {
+ 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, "create") &&
+ strcmp(aname, "loopaesOpen")) {
usage(popt_context, EXIT_FAILURE,
- _("Option --key-size is allowed only for luksFormat and create.\n"
+ _("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_file)
log_err(_("Option --key-file takes precedence over specified key file argument.\n"));
else
- opt_key_file = (char*)action_argv[1];
+ opt_key_file = action_argv[1];
+ }
+
+ if (opt_keyfile_size < 0 || opt_new_keyfile_size < 0 || opt_key_size < 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, _("Option --uuid is allowed only for luksFormat and luksUUID."),
poptGetInvocationName(popt_context));
- if ((opt_offset || opt_skip) && strcmp(aname, "create"))
- usage(popt_context, EXIT_FAILURE, _("Options --offset and --skip are supported only for create command.\n"),
- poptGetInvocationName(popt_context));
+ if (opt_skip && strcmp(aname, "create") && strcmp(aname, "loopaesOpen"))
+ usage(popt_context, EXIT_FAILURE,
+ _("Option --skip is supported only for create and loopaesOpen commands.\n"),
+ poptGetInvocationName(popt_context));
+
+ if (opt_offset && strcmp(aname, "create") && strcmp(aname, "loopaesOpen"))
+ usage(popt_context, EXIT_FAILURE,
+ _("Option --offset is supported only for create and loopaesOpen commands.\n"),
+ poptGetInvocationName(popt_context));
if (opt_debug) {
opt_verbose = 1;
projects / platform / upstream / cryptsetup.git / blobdiff