*
* 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.
+ * Copyright (C) 2009-2012, 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
#include <inttypes.h>
#include <errno.h>
#include <unistd.h>
+#include <ctype.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
#include <limits.h>
-#include <libcryptsetup.h>
#include <popt.h>
#include "cryptsetup.h"
static int opt_key_size = 0;
static long opt_keyfile_size = 0;
static long opt_new_keyfile_size = 0;
+static long opt_keyfile_offset = 0;
+static long opt_new_keyfile_offset = 0;
static int opt_key_slot = CRYPT_ANY_SLOT;
static uint64_t opt_size = 0;
static uint64_t opt_offset = 0;
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 struct action_type {
const char *type;
{ "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") },
+ { "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") },
log_err(".\n");
}
+static const char *uuid_or_device(const char *spec)
+{
+ static char device[PATH_MAX];
+ char s, *ptr;
+ int i = 0, uuid_len = 5;
+
+ /* Check if it is correct UUID=<LUKS_UUID> format */
+ if (spec && !strncmp(spec, "UUID=", uuid_len)) {
+ strcpy(device, "/dev/disk/by-uuid/");
+ ptr = &device[strlen(device)];
+ i = uuid_len;
+ while ((s = spec[i++]) && i < PATH_MAX) {
+ if (!isxdigit(s) && s != '-')
+ return spec; /* Bail it out */
+ if (isalpha(s))
+ s = tolower(s);
+ *ptr++ = s;
+ }
+ *ptr = '\0';
+ return device;
+ }
+
+ return spec;
+}
+
static int action_create(int arg __attribute__((unused)))
{
struct crypt_device *cd = NULL;
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"));
+ if ((opt_keyfile_offset || opt_keyfile_size) && opt_key_file)
+ log_std(("Ignoring keyfile offset and size options, keyfile read "
+ "size is always the same as encryption key size.\n"));
r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(PLAIN),
cipher, NULL, cipher_mode);
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,
+ r = crypt_activate_by_keyfile_offset(cd, action_argv[0],
+ CRYPT_ANY_SLOT, opt_key_file,
+ params.hash ? 0 : key_size, 0,
activate_flags);
else {
r = crypt_get_key(_("Enter passphrase: "),
- &password, &passwordLen, opt_keyfile_size,
+ &password, &passwordLen,
+ opt_keyfile_offset, opt_keyfile_size,
NULL, opt_timeout,
_verify_passphrase(0),
cd);
if (r < 0)
goto out;
- r = crypt_activate_by_keyfile(cd, action_argv[1], CRYPT_ANY_SLOT,
- opt_key_file, opt_keyfile_size, activate_flags);
+ r = crypt_activate_by_keyfile_offset(cd, action_argv[1], CRYPT_ANY_SLOT,
+ opt_key_file, opt_keyfile_size,
+ opt_keyfile_size, activate_flags);
out:
crypt_free(cd);
}
out:
crypt_free(cd);
+ if (r == -ENOTSUP)
+ r = 0;
return r;
}
return -EINVAL;
}
+static int action_luksRepair(int arg __attribute__((unused)))
+{
+ struct crypt_device *cd = NULL;
+ int r;
+
+ if ((r = crypt_init(&cd, action_argv[0])))
+ goto out;
+
+ /* Currently only LUKS1 allows repair */
+ crypt_set_log_callback(cd, _quiet_log, NULL);
+ r = crypt_load(cd, CRYPT_LUKS1, NULL);
+ crypt_set_log_callback(cd, _log, NULL);
+ if (r == 0) {
+ log_verbose( _("No known problems detected for LUKS header.\n"));
+ goto out;
+ }
+
+ r = _yesDialog(_("Really try to repair LUKS device header?"),
+ NULL) ? 0 : -EINVAL;
+ if (r == 0)
+ r = crypt_repair(cd, CRYPT_LUKS1, NULL);
+out:
+ crypt_free(cd);
+ return r;
+}
+
static int action_luksFormat(int arg __attribute__((unused)))
{
int r = -EINVAL, keysize;
crypt_set_rng_type(cd, CRYPT_RNG_URANDOM);
r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
- opt_keyfile_size, opt_key_file, opt_timeout,
- _verify_passphrase(1), cd);
+ opt_keyfile_offset, opt_keyfile_size, opt_key_file,
+ opt_timeout, _verify_passphrase(1), cd);
if (r < 0)
goto out;
int r, keysize;
if (opt_header_device) {
- header_device = opt_header_device;
+ header_device = uuid_or_device(opt_header_device);
data_device = action_argv[0];
} else {
- header_device = action_argv[0];
+ header_device = uuid_or_device(action_argv[0]);
data_device = NULL;
}
key, keysize, flags);
} else if (opt_key_file) {
crypt_set_password_retry(cd, 1);
- r = crypt_activate_by_keyfile(cd, action_argv[1],
+ r = crypt_activate_by_keyfile_offset(cd, action_argv[1],
opt_key_slot, opt_key_file, opt_keyfile_size,
- flags);
+ opt_keyfile_offset, flags);
} else
r = crypt_activate_by_passphrase(cd, action_argv[1],
opt_key_slot, NULL, 0, flags);
static int verify_keyslot(struct crypt_device *cd, int key_slot,
char *msg_last, char *msg_pass,
- const char *key_file, int keyfile_size)
+ const char *key_file, int keyfile_offset,
+ int keyfile_size)
{
crypt_keyslot_info ki;
char *password = NULL;
return -EPERM;
r = crypt_get_key(msg_pass, &password, &passwordLen,
- keyfile_size, key_file, opt_timeout,
+ keyfile_offset, keyfile_size, key_file, opt_timeout,
_verify_passphrase(0), cd);
if(r < 0)
goto out;
struct crypt_device *cd = NULL;
int r;
- if ((r = crypt_init(&cd, action_argv[0])))
+ if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
crypt_set_confirm_callback(cd, _yesDialog, NULL);
r = verify_keyslot(cd, opt_key_slot,
_("This is the last keyslot. Device will become unusable after purging this key."),
_("Enter any remaining LUKS passphrase: "),
- opt_key_file, opt_keyfile_size);
+ opt_key_file, opt_keyfile_offset, opt_keyfile_size);
if (r < 0)
goto out;
}
size_t passwordLen;
int r;
- if ((r = crypt_init(&cd, action_argv[0])))
+ if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
crypt_set_confirm_callback(cd, _yesDialog, NULL);
r = crypt_get_key(_("Enter LUKS passphrase to be deleted: "),
&password, &passwordLen,
- opt_keyfile_size, opt_key_file,
+ opt_keyfile_offset, opt_keyfile_size, opt_key_file,
opt_timeout,
_verify_passphrase(0),
cd);
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])))
+ if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
crypt_set_confirm_callback(cd, _yesDialog, NULL);
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);
+ r = crypt_keyslot_add_by_keyfile_offset(cd, opt_key_slot,
+ opt_key_file, opt_keyfile_size, opt_keyfile_offset,
+ opt_new_key_file, opt_new_keyfile_size, opt_new_keyfile_offset);
} else {
r = crypt_keyslot_add_by_passphrase(cd, opt_key_slot,
NULL, 0, NULL, 0);
size_t vk_size;
int new_key_slot, old_key_slot, r;
- if ((r = crypt_init(&cd, action_argv[0])))
+ if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
r = crypt_get_key(_("Enter LUKS passphrase to be changed: "),
&password, &passwordLen,
- opt_keyfile_size, opt_key_file, opt_timeout,
- _verify_passphrase(0), cd);
+ opt_keyfile_offset, opt_keyfile_size, opt_key_file,
+ opt_timeout, _verify_passphrase(0), cd);
if (r < 0)
goto out;
passwordLen = 0;
r = crypt_get_key(_("Enter new LUKS passphrase: "),
&password, &passwordLen,
- opt_new_keyfile_size, opt_new_key_file,
+ opt_new_keyfile_offset, opt_new_keyfile_size,
+ opt_new_key_file,
opt_timeout, _verify_passphrase(0), cd);
if (r < 0)
goto out;
return -ENOMEM;
r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
- opt_keyfile_size, opt_key_file, opt_timeout, 0, cd);
+ opt_keyfile_offset, opt_keyfile_size, opt_key_file,
+ opt_timeout, 0, cd);
if (r < 0)
goto out;
struct crypt_device *cd = NULL;
int r;
- if ((r = crypt_init(&cd, action_argv[0])))
+ if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
crypt_set_password_verify(cd, _verify_passphrase(0));
if (opt_key_file)
- r = crypt_resume_by_keyfile(cd, action_argv[0], CRYPT_ANY_SLOT,
- opt_key_file, opt_keyfile_size);
+ r = crypt_resume_by_keyfile_offset(cd, action_argv[0], CRYPT_ANY_SLOT,
+ opt_key_file, opt_keyfile_size, opt_keyfile_offset);
else
r = crypt_resume_by_passphrase(cd, action_argv[0], CRYPT_ANY_SLOT,
NULL, 0);
return -EINVAL;
}
- if ((r = crypt_init(&cd, action_argv[0])))
+ if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
crypt_set_confirm_callback(cd, _yesDialog, 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_LONG, &opt_keyfile_size, 0, N_("Limits the read from keyfile"), N_("bytes") },
+ { "keyfile-offset", '\0', POPT_ARG_LONG, &opt_keyfile_offset, 0, N_("Number of bytes to skip in 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") },
+ { "new-keyfile-offset",'\0', POPT_ARG_LONG, &opt_new_keyfile_offset, 0, N_("Number of bytes to skip in 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") },
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
+ crypt_fips_self_check(NULL);
+
popt_context = poptGetContext(PACKAGE, argc, argv, popt_options, 0);
poptSetOtherOptionHelp(popt_context,
- N_("[OPTION...] <action> <action-specific>]"));
+ N_("[OPTION...] <action> <action-specific>"));
while((r = poptGetNextOpt(popt_context)) > 0) {
unsigned long long ull_value;
opt_key_file = action_argv[1];
}
- if (opt_keyfile_size < 0 || opt_new_keyfile_size < 0 || opt_key_size < 0) {
+ if (opt_keyfile_size < 0 || opt_new_keyfile_size < 0 || opt_key_size < 0 ||
+ opt_keyfile_offset < 0 || opt_new_keyfile_offset < 0) {
usage(popt_context, EXIT_FAILURE,
_("Negative number for option not permitted."),
poptGetInvocationName(popt_context));
if (opt_random && opt_urandom)
usage(popt_context, EXIT_FAILURE, _("Only one of --use-[u]random options is allowed."),
poptGetInvocationName(popt_context));
+
if ((opt_random || opt_urandom) && strcmp(aname, "luksFormat"))
usage(popt_context, EXIT_FAILURE, _("Option --use-[u]random is allowed only for luksFormat."),
poptGetInvocationName(popt_context));
usage(popt_context, EXIT_FAILURE, _("Option --uuid is allowed only for luksFormat and luksUUID."),
poptGetInvocationName(popt_context));
+ if (opt_align_payload && strcmp(aname, "luksFormat"))
+ 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"))
usage(popt_context, EXIT_FAILURE,
_("Option --skip is supported only for create and loopaesOpen commands.\n"),
projects / platform / upstream / cryptsetup.git / blobdiff