#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
+#include <stdarg.h>
#include <inttypes.h>
#include <errno.h>
#include <unistd.h>
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 int opt_key_slot = CRYPT_ANY_SLOT;
static uint64_t opt_size = 0;
static uint64_t opt_offset = 0;
static int opt_tries = 3;
static int opt_align_payload = 0;
static int opt_non_exclusive = 0;
+static int opt_random = 0;
+static int opt_urandom = 0;
static const char **action_argv;
static int action_argc;
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 struct action_type {
const char *type;
int (*handler)(int);
int arg;
int required_action_argc;
- int required_dm_backend;
int required_memlock;
- int show_status;
const char *arg_desc;
const char *desc;
} action_types[] = {
- { "create", action_create, 0, 2, 1, 1, 1, N_("<name> <device>"),N_("create device") },
- { "remove", action_remove, 0, 1, 1, 0, 1, N_("<name>"), N_("remove device") },
- { "resize", action_resize, 0, 1, 1, 1, 1, N_("<name>"), N_("resize active device") },
- { "status", action_status, 0, 1, 1, 0, 1, N_("<name>"), N_("show device status") },
- { "luksFormat", action_luksFormat, 0, 1, 1, 1, 1, N_("<device> [<new key file>]"), N_("formats a LUKS device") },
- { "luksOpen", action_luksOpen, 0, 2, 1, 1, 1, N_("<device> <name> "), N_("open LUKS device as mapping <name>") },
- { "luksAddKey", action_luksAddKey, 0, 1, 1, 1, 1, N_("<device> [<new key file>]"), N_("add key to LUKS device") },
- { "luksRemoveKey",action_luksRemoveKey, 0, 1, 1, 1, 1, N_("<device> [<key file>]"), N_("removes supplied key or key file from LUKS device") },
- { "luksKillSlot", action_luksKillSlot, 0, 2, 1, 1, 1, N_("<device> <key slot>"), N_("wipes key with number <key slot> from LUKS device") },
- { "luksUUID", action_luksUUID, 0, 1, 0, 0, 1, N_("<device>"), N_("print UUID of LUKS device") },
- { "isLuks", action_isLuks, 0, 1, 0, 0, 0, N_("<device>"), N_("tests <device> for LUKS partition header") },
- { "luksClose", action_remove, 0, 1, 1, 0, 1, N_("<name>"), N_("remove LUKS mapping") },
- { "luksDump", action_luksDump, 0, 1, 0, 0, 1, N_("<device>"), N_("dump LUKS partition information") },
- { "luksSuspend",action_luksSuspend, 0, 1, 1, 1, 1, N_("<device>"), N_("Suspend LUKS device and wipe key (all IOs are frozen).") },
- { "luksResume", action_luksResume, 0, 1, 1, 1, 1, N_("<device>"), N_("Resume suspended LUKS device.") },
- { "luksDelKey", action_luksDelKey, 0, 2, 1, 1, 1, N_("<device> <key slot>"), N_("identical to luksKillSlot - DEPRECATED - see man page") },
- { "reload", action_create, 1, 2, 1, 1, 1, N_("<name> <device>"), N_("modify active device - DEPRECATED - see man page") },
- { NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL }
+ { "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") },
+ { "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") },
+ { "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") },
+ { "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") },
+ { "luksDelKey", action_luksDelKey, 0, 2, 1, N_("<device> <key slot>"), N_("identical to luksKillSlot - DEPRECATED - see man page") },
+ { "reload", action_create, 1, 2, 1, N_("<name> <device>"), N_("modify active device - DEPRECATED - see man page") },
+ { NULL, NULL, 0, 0, 0, NULL, NULL }
};
+static void clogger(struct crypt_device *cd, int level, const char *file,
+ int line, const char *format, ...)
+{
+ va_list argp;
+ char *target = NULL;
+
+ va_start(argp, format);
+
+ if (vasprintf(&target, format, argp) > 0) {
+ if (level >= 0) {
+ crypt_log(cd, level, target);
+#ifdef CRYPT_DEBUG
+ } else if (opt_debug)
+ printf("# %s:%d %s\n", file ?: "?", line, target);
+#else
+ } else if (opt_debug)
+ printf("# %s\n", target);
+#endif
+ }
+
+ va_end(argp);
+ free(target);
+}
+
/* Interface Callbacks */
static int yesDialog(char *msg)
{
return r;
}
-static void cmdLineLog(int class, char *msg) {
- switch(class) {
-
- case CRYPT_LOG_NORMAL:
- fputs(msg, stdout);
- break;
- case CRYPT_LOG_ERROR:
- fputs(msg, stderr);
- break;
- default:
- fprintf(stderr, "Internal error on logging class for msg: %s", msg);
- break;
- }
+static void cmdLineLog(int level, char *msg) {
+ switch(level) {
+
+ case CRYPT_LOG_NORMAL:
+ fputs(msg, stdout);
+ break;
+ case CRYPT_LOG_VERBOSE:
+ if (opt_verbose)
+ fputs(msg, stdout);
+ break;
+ case CRYPT_LOG_ERROR:
+ fputs(msg, stderr);
+ break;
+ default:
+ fprintf(stderr, "Internal error on logging class for msg: %s", msg);
+ break;
+ }
}
static struct interface_callbacks cmd_icb = {
- .yesDialog = yesDialog,
- .log = cmdLineLog,
+ .yesDialog = yesDialog,
+ .log = cmdLineLog,
};
+static void _log(int level, const char *msg, void *usrptr)
+{
+ cmdLineLog(level, (char *)msg);
+}
+
+static int _yesDialog(const char *msg, void *usrptr)
+{
+ return yesDialog((char*)msg);
+}
+
/* End ICBs */
static void show_status(int errcode)
{
char error[256], *error_;
- if(!errcode && opt_verbose) {
+ if(!opt_verbose)
+ return;
+
+ if(!errcode) {
log_std(_("Command successful.\n"));
return;
}
crypt_get_error(error, sizeof(error));
if (!error[0]) {
- error_ = strerror_r(errcode, error, sizeof(error));
+ error_ = strerror_r(-errcode, error, sizeof(error));
if (error_ != error) {
strncpy(error, error_, sizeof(error));
error[sizeof(error) - 1] = '\0';
}
}
- log_err(_("Command failed"));
+ log_err(_("Command failed with code %i"), -errcode);
if (*error)
log_err(": %s\n", error);
else
log_err(".\n");
- return;
}
static int action_create(int reload)
struct crypt_options options = {
.name = action_argv[0],
.device = action_argv[1],
- .cipher = opt_cipher?opt_cipher:DEFAULT_CIPHER,
- .hash = opt_hash ?: DEFAULT_HASH,
+ .cipher = opt_cipher ? opt_cipher : DEFAULT_CIPHER(PLAIN),
+ .hash = opt_hash ?: DEFAULT_PLAIN_HASH,
.key_file = opt_key_file,
- .key_size = ((opt_key_size)?opt_key_size:DEFAULT_KEY_SIZE)/8,
+ .key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS) / 8,
.key_slot = opt_key_slot,
.flags = 0,
.size = opt_size,
log_std("%s/%s is active:\n", crypt_get_dir(), options.name);
log_std(" cipher: %s\n", options.cipher);
log_std(" keysize: %d bits\n", options.key_size * 8);
- log_std(" device: %s\n", options.device);
+ log_std(" device: %s\n", options.device ?: "");
log_std(" offset: %" PRIu64 " sectors\n", options.offset);
log_std(" size: %" PRIu64 " sectors\n", options.size);
if (options.skip)
return r;
}
-static int _action_luksFormat_generateMK()
-{
- struct crypt_options options = {
- .key_size = (opt_key_size ?: DEFAULT_LUKS_KEY_SIZE) / 8,
- .key_slot = opt_key_slot,
- .device = action_argv[0],
- .cipher = opt_cipher ?: DEFAULT_LUKS_CIPHER,
- .hash = opt_hash ?: DEFAULT_LUKS_HASH,
- .new_key_file = action_argc > 1 ? action_argv[1] : NULL,
- .flags = opt_verify_passphrase ? CRYPT_FLAG_VERIFY : (!opt_batch_mode?CRYPT_FLAG_VERIFY_IF_POSSIBLE : 0),
- .iteration_time = opt_iteration_time,
- .timeout = opt_timeout,
- .align_payload = opt_align_payload,
- .icb = &cmd_icb,
- };
-
- return crypt_luksFormat(&options);
-}
-
static int _read_mk(const char *file, char **key, int keysize)
{
int fd;
- *key = malloc(keysize);
+ *key = crypt_safe_alloc(keysize);
if (!*key)
return -ENOMEM;
fd = open(file, O_RDONLY);
if (fd == -1) {
log_err("Cannot read keyfile %s.\n", file);
- return -EINVAL;
+ goto fail;
}
if ((read(fd, *key, keysize) != keysize)) {
log_err("Cannot read %d bytes from keyfile %s.\n", keysize, file);
close(fd);
- memset(*key, 0, keysize);
- free(*key);
- return -EINVAL;
+ goto fail;
}
close(fd);
return 0;
+fail:
+ crypt_safe_free(*key);
+ *key = NULL;
+ return -EINVAL;
}
-static int _action_luksFormat_useMK()
+static int action_luksFormat(int arg)
{
int r = -EINVAL, keysize;
- char *key = NULL, cipher [MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
+ char *msg = NULL, *key = NULL, cipher [MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
+ const char *key_file = NULL;
+ char *password = NULL;
+ unsigned int passwordLen;
struct crypt_device *cd = NULL;
struct crypt_params_luks1 params = {
- .hash = opt_hash ?: DEFAULT_LUKS_HASH,
+ .hash = opt_hash ?: DEFAULT_LUKS1_HASH,
.data_alignment = opt_align_payload,
};
- if (parse_into_name_and_mode(opt_cipher ?: DEFAULT_LUKS_CIPHER, cipher, cipher_mode)) {
- log_err("No known cipher specification pattern detected.\n");
- return -EINVAL;
+ if (action_argc > 1) {
+ key_file = action_argv[1];
+ if (opt_key_file)
+ log_err(_("Option --key-file takes precedence over specified key file argument.\n"));
+ } else
+ key_file = opt_key_file;
+
+ if(asprintf(&msg, _("This will overwrite data on %s irrevocably."), action_argv[0]) == -1) {
+ log_err(_("memory allocation error in action_luksFormat"));
+ r = -ENOMEM;
+ goto out;
}
+ r = yesDialog(msg) ? 0 : -EINVAL;
+ free(msg);
+ if (r < 0)
+ goto out;
- keysize = (opt_key_size ?: DEFAULT_LUKS_KEY_SIZE) / 8;
- if (_read_mk(opt_master_key_file, &key, keysize) < 0)
- return -EINVAL;
+ r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(LUKS1),
+ cipher, cipher_mode);
+ if (r < 0) {
+ log_err("No known cipher specification pattern detected.\n");
+ goto out;
+ }
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
+ crypt_set_log_callback(cd, _log, NULL);
+
+ keysize = (opt_key_size ?: DEFAULT_LUKS1_KEYBITS) / 8;
+
crypt_set_password_verify(cd, 1);
crypt_set_timeout(cd, opt_timeout);
if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time);
- if ((r = crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, keysize, ¶ms)))
+ if (opt_random)
+ crypt_set_rng_type(cd, CRYPT_RNG_RANDOM);
+ 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, key_file,
+ opt_timeout,
+ opt_batch_mode ? 0 : 1, /* always verify */
+ cd);
+ if(!password)
goto out;
- r = crypt_keyslot_add_by_volume_key(cd, opt_key_slot, key, keysize, NULL, 0);
-out:
+ if (opt_master_key_file) {
+ r = _read_mk(opt_master_key_file, &key, keysize);
+ if (r < 0)
+ goto out;
+ }
+
+ r = crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode,
+ opt_uuid, key, keysize, ¶ms);
+ if (r < 0)
+ goto out;
+ r = crypt_keyslot_add_by_volume_key(cd, opt_key_slot,
+ key, keysize,
+ password, passwordLen);
+out:
crypt_free(cd);
- if (key) {
- memset(key, 0, keysize);
- free(key);
- }
- return r;
+ crypt_safe_free(key);
+ crypt_safe_free(password);
+
+ return (r < 0) ? r : 0;
}
-static int action_luksFormat(int arg)
+static int action_luksOpen(int arg)
{
- int r = 0; char *msg = NULL;
-
- /* Avoid overwriting possibly wrong part of device than user requested by rejecting these options */
- if (opt_offset || opt_skip) {
- log_err("Options --offset and --skip are not supported for luksFormat.\n");
- return -EINVAL;
- }
+ struct crypt_device *cd = NULL;
+ uint32_t flags = 0;
+ int r;
- if(asprintf(&msg, _("This will overwrite data on %s irrevocably."), action_argv[0]) == -1) {
- log_err(_("memory allocation error in action_luksFormat"));
- return -ENOMEM;
- }
- r = yesDialog(msg);
- free(msg);
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
- if (!r)
- return -EINVAL;
+ crypt_set_log_callback(cd, _log, NULL);
- if (opt_master_key_file)
- return _action_luksFormat_useMK();
- else
- return _action_luksFormat_generateMK();
-}
+ if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
+ goto out;
-static int action_luksOpen(int arg)
-{
- struct crypt_options options = {
- .name = action_argv[1],
- .device = action_argv[0],
- .key_file = opt_key_file,
- .key_size = opt_key_file ? (opt_key_size / 8) : 0, /* limit bytes read from keyfile */
- .timeout = opt_timeout,
- .tries = opt_key_file ? 1 : opt_tries, /* verify is usefull only for tty */
- .icb = &cmd_icb,
- };
+ crypt_set_timeout(cd, opt_timeout);
+ crypt_set_password_retry(cd, opt_tries);
+ if (opt_iteration_time)
+ crypt_set_iterarion_time(cd, opt_iteration_time);
if (opt_readonly)
- options.flags |= CRYPT_FLAG_READONLY;
+ flags |= CRYPT_ACTIVATE_READONLY;
+
if (opt_non_exclusive)
log_err(_("Obsolete option --non-exclusive is ignored.\n"));
- return crypt_luksOpen(&options);
+
+ if (opt_key_file) {
+ crypt_set_password_retry(cd, 1);
+ r = crypt_activate_by_keyfile(cd, action_argv[1],
+ CRYPT_ANY_SLOT, opt_key_file, opt_keyfile_size,
+ flags);
+ } else
+ r = crypt_activate_by_passphrase(cd, action_argv[1],
+ CRYPT_ANY_SLOT, NULL, 0, flags);
+out:
+ crypt_free(cd);
+ return (r < 0) ? r : 0;
}
+/* FIXME: keyslot operation needs better get_key() implementation. Use old API for now */
static int action_luksDelKey(int arg)
{
log_err("luksDelKey is a deprecated action name.\nPlease use luksKillSlot.\n");
return crypt_luksRemoveKey(&options);
}
-static int _action_luksAddKey_useMK()
+static int action_luksAddKey(int arg)
{
- int r = -EINVAL, keysize;
+ int r = -EINVAL, keysize = 0;
char *key = NULL;
+ const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
struct crypt_device *cd = NULL;
if ((r = crypt_init(&cd, action_argv[0])))
goto out;
+ crypt_set_log_callback(cd, _log, NULL);
+ crypt_set_confirm_callback(cd, _yesDialog, NULL);
+
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out;
keysize = crypt_get_volume_key_size(cd);
- crypt_set_password_verify(cd, 1);
+ crypt_set_password_verify(cd, opt_verify_passphrase ? 1 : 0);
crypt_set_timeout(cd, opt_timeout);
if (opt_iteration_time)
crypt_set_iterarion_time(cd, opt_iteration_time);
- if (_read_mk(opt_master_key_file, &key, keysize) < 0)
- goto out;
+ if (opt_master_key_file) {
+ if (_read_mk(opt_master_key_file, &key, keysize) < 0)
+ goto out;
- r = crypt_keyslot_add_by_volume_key(cd, opt_key_slot, key, keysize, NULL, 0);
+ r = crypt_keyslot_add_by_volume_key(cd, opt_key_slot,
+ key, keysize, NULL, 0);
+ } else if (opt_key_file || opt_new_key_file) {
+ r = crypt_keyslot_add_by_keyfile(cd, opt_key_slot,
+ opt_key_file, opt_keyfile_size,
+ opt_new_key_file, opt_new_keyfile_size);
+ } else {
+ r = crypt_keyslot_add_by_passphrase(cd, opt_key_slot,
+ NULL, 0, NULL, 0);
+ }
out:
crypt_free(cd);
- if (key) {
- memset(key, 0, keysize);
- free(key);
- }
- return r;
-}
-
-static int action_luksAddKey(int arg)
-{
- struct crypt_options options = {
- .device = action_argv[0],
- .new_key_file = action_argc>1?action_argv[1]:NULL,
- .key_file = opt_key_file,
- .key_slot = opt_key_slot,
- .flags = opt_verify_passphrase ? CRYPT_FLAG_VERIFY : (!opt_batch_mode?CRYPT_FLAG_VERIFY_IF_POSSIBLE : 0),
- .iteration_time = opt_iteration_time,
- .timeout = opt_timeout,
- .icb = &cmd_icb,
- };
+ crypt_safe_free(key);
- if (opt_master_key_file)
- return _action_luksAddKey_useMK();
- else
- return crypt_luksAddKey(&options);
+ return (r < 0) ? r : 0;
}
static int action_isLuks(int arg)
static int action_luksUUID(int arg)
{
- struct crypt_options options = {
- .device = action_argv[0],
- .icb = &cmd_icb,
- };
+ struct crypt_device *cd = NULL;
+ const char *existing_uuid = NULL;
+ int r;
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ crypt_set_log_callback(cd, _log, NULL);
+ crypt_set_confirm_callback(cd, _yesDialog, NULL);
+
+ if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
+ goto out;
+
+ if (opt_uuid)
+ r = crypt_set_uuid(cd, opt_uuid);
+ else {
+ existing_uuid = crypt_get_uuid(cd);
+ log_std("%s\n", existing_uuid ?: "");
+ r = existing_uuid ? 0 : 1;
+ }
+out:
+ crypt_free(cd);
+ return r;
- return crypt_luksUUID(&options);
}
static int action_luksDump(int arg)
if (opt_key_file)
r = crypt_resume_by_keyfile(cd, action_argv[0], CRYPT_ANY_SLOT,
- opt_key_file, opt_key_size / 8);
+ opt_key_file, opt_keyfile_size);
else
r = crypt_resume_by_passphrase(cd, action_argv[0], CRYPT_ANY_SLOT,
NULL, 0);
return r;
}
+static int action_luksBackup(int arg)
+{
+ struct crypt_device *cd = NULL;
+ int r;
+
+ if (!opt_header_backup_file) {
+ log_err(_("Option --header-backup-file is required.\n"));
+ return -EINVAL;
+ }
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ crypt_set_log_callback(cd, _log, NULL);
+ crypt_set_confirm_callback(cd, _yesDialog, NULL);
+
+ r = crypt_header_backup(cd, CRYPT_LUKS1, opt_header_backup_file);
+out:
+ crypt_free(cd);
+ return r;
+}
+
+static int action_luksRestore(int arg)
+{
+ struct crypt_device *cd = NULL;
+ int r = 0;
+
+ if (!opt_header_backup_file) {
+ log_err(_("Option --header-backup-file is required.\n"));
+ return -EINVAL;
+ }
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ crypt_set_log_callback(cd, _log, NULL);
+ crypt_set_confirm_callback(cd, _yesDialog, NULL);
+ r = crypt_header_restore(cd, CRYPT_LUKS1, opt_header_backup_file);
+out:
+ crypt_free(cd);
+ return r;
+}
+
static void usage(poptContext popt_context, int exitcode,
const char *error, const char *more)
{
"<key slot> is the LUKS key slot number to modify\n"
"<key file> optional key file for the new key for luksAddKey action\n"),
crypt_get_dir());
+
+ log_std(_("\nDefault compiled-in device cipher parameters:\n"
+ "\tplain: %s, Key: %d bits, Password hashing: %s\n"
+ "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"),
+ DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH,
+ DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH,
+ DEFAULT_RNG);
exit(0);
} else
usage(popt_context, 0, NULL, NULL);
{
int r;
- if (dm_init(NULL, action->required_dm_backend) < 1) {
- log_err("Cannot communicate with device-mapper. Is dm_mod kernel module loaded?\n");
- return -ENOSYS;
- }
-
if (action->required_memlock)
crypt_memory_lock(NULL, 1);
if (action->required_memlock)
crypt_memory_lock(NULL, 0);
- if (action->required_dm_backend)
- dm_exit();
-
- if (r < 0 && (opt_verbose || action->show_status))
- show_status(-r);
+ show_status(r);
return r;
}
POPT_TABLEEND
};
static struct poptOption popt_options[] = {
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, popt_help_options, 0, N_("Help options:"), 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 | POPT_ARGFLAG_SHOW_DEFAULT, &opt_cipher, 0, N_("The cipher used to encrypt the disk (see /proc/crypto)"), NULL },
- { "hash", 'h', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &opt_hash, 0, N_("The hash used to create the encryption key from the passphrase"), 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 (can be /dev/random)"), NULL },
- { "master-key-file", '\0', POPT_ARG_STRING, &opt_master_key_file, 0, N_("Read the volume (master) key from file."), NULL },
- { "key-size", 's', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &opt_key_size, 0, N_("The size of the encryption key"), N_("BITS") },
- { "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") },
- { "skip", 'p', POPT_ARG_STRING, &popt_tmp, 3, N_("How many sectors of the encrypted data to skip at the beginning"), N_("SECTORS") },
- { "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 canbe retried"), NULL },
- { "align-payload", '\0', POPT_ARG_INT, &opt_align_payload, 0, N_("Align payload at <n> sector boundaries - for luksFormat"), N_("SECTORS") },
- { "non-exclusive", '\0', POPT_ARG_NONE, &opt_non_exclusive, 0, N_("Allows non-exclusive access for luksOpen, WARNING see manpage."), NULL },
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, popt_help_options, 0, N_("Help options:"), 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 },
+ { "hash", 'h', POPT_ARG_STRING, &opt_hash, 0, N_("The hash used to create the encryption key from the passphrase"), 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 },
+ { "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") },
+ { "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") },
+ { "skip", 'p', POPT_ARG_STRING, &popt_tmp, 3, N_("How many sectors of the encrypted data to skip at the beginning"), N_("SECTORS") },
+ { "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") },
+ { "non-exclusive", '\0', POPT_ARG_NONE, &opt_non_exclusive, 0, N_("(Obsoleted, see man page.)"), NULL },
+ { "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 },
POPT_TABLEEND
};
poptContext popt_context;
int r;
const char *null_action_argv[] = {NULL};
- set_default_log(cmdLineLog);
+ crypt_set_log_callback(NULL, _log, NULL);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
exit(0);
}
- if (opt_key_size % 8)
- usage(popt_context, 1,
- _("Key size must be a multiple of 8 bits"),
- poptGetInvocationName(popt_context));
-
if (!(aname = (char *)poptGetArg(popt_context)))
usage(popt_context, 1, _("Argument <action> missing."),
poptGetInvocationName(popt_context));
usage(popt_context, 1, _("Unknown action."),
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"
+ "To limit read from keyfile use --keyfile-size=(bytes)."),
+ poptGetInvocationName(popt_context));
+ }
+
+ if (opt_key_size % 8)
+ usage(popt_context, 1,
+ _("Key size must be a multiple of 8 bits"),
+ poptGetInvocationName(popt_context));
+
+ /* FIXME: use per format define here */
+ if (opt_key_slot != CRYPT_ANY_SLOT &&
+ (opt_key_slot < 0 || opt_key_slot > 8)) {
+ usage(popt_context, 1, _("Key slot is invalid."),
+ poptGetInvocationName(popt_context));
+ }
+
+ if (opt_random && opt_urandom)
+ usage(popt_context, 1, _("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."),
+ 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."),
+ 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"),
+ poptGetInvocationName(popt_context));
+
action_argc = 0;
action_argv = poptGetArgs(popt_context);
/* Make return values of poptGetArgs more consistent in case of remaining argc = 0 */
projects / platform / upstream / cryptsetup.git / blobdiff