X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcryptsetup.c;h=09d7510680aeb9b6ae3512839970364f481f4181;hb=fb3b62ca02013b8526fc0e73bc5c19f737be27fa;hp=a829fb90a7ab4dff90f686a7d7df46bf09dc715a;hpb=5d2205a2f8a0e22d650a7bdb3ef73d7cdc15eef3;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/src/cryptsetup.c b/src/cryptsetup.c index a829fb9..09d7510 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -3,7 +3,7 @@ * * Copyright (C) 2004, Christophe Saout * Copyright (C) 2004-2007, Clemens Fruhwirth - * 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 @@ -16,7 +16,7 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -27,25 +27,30 @@ #include #include #include +#include +#include #include #include -#include +#include #include #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 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 const char *opt_header_device = NULL; 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; @@ -61,6 +66,9 @@ static int opt_align_payload = 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 int opt_test_passphrase = 0; static const char **action_argv; static int action_argc; @@ -83,6 +91,7 @@ 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 struct action_type { const char *type; @@ -97,6 +106,7 @@ static struct action_type { { "remove", action_remove, 0, 1, 1, N_(""), N_("remove device") }, { "resize", action_resize, 0, 1, 1, N_(""), N_("resize active device") }, { "status", action_status, 0, 1, 0, N_(""), N_("show device status") }, + { "repair", action_luksRepair, 0, 1, 1, N_(""), N_("try to repair on-disk metadata") }, { "luksFormat", action_luksFormat, 0, 1, 1, N_(" []"), N_("formats a LUKS device") }, { "luksOpen", action_luksOpen, 0, 2, 1, N_(" "), N_("open LUKS device as mapping ") }, { "luksAddKey", action_luksAddKey, 0, 1, 1, N_(" []"), N_("add key to LUKS device") }, @@ -147,7 +157,7 @@ static int _yesDialog(const char *msg, void *usrptr __attribute__((unused))) size_t size = 0; int r = 1; - if(isatty(0) && !opt_batch_mode) { + if(isatty(STDIN_FILENO) && !opt_batch_mode) { log_std("\nWARNING!\n========\n"); log_std("%s\n\nAre you sure? (Type uppercase yes): ", msg); if(getline(&answer, &size, stdin) == -1) { @@ -187,6 +197,31 @@ static void _log(int level, const char *msg, void *usrptr __attribute__((unused) } } +static void _quiet_log(int level, const char *msg, void *usrptr) +{ + if (!opt_verbose && (level == CRYPT_LOG_ERROR || level == CRYPT_LOG_NORMAL)) + level = CRYPT_LOG_VERBOSE; + _log(level, msg, usrptr); +} + +static int _verify_passphrase(int def) +{ + /* Batch mode switch off verify - if not overrided by -y */ + if (opt_verify_passphrase) + def = 1; + else if (opt_batch_mode) + def = 0; + + /* Non-tty input doesn't allow verify */ + if (def && !isatty(STDIN_FILENO)) { + if (opt_verify_passphrase) + log_err(_("Can't do passphrase verification on non-tty inputs.\n")); + def = 0; + } + + return def; +} + static void show_status(int errcode) { char error[256], *error_; @@ -216,6 +251,31 @@ static void show_status(int errcode) 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= 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; @@ -224,10 +284,12 @@ static int action_create(int arg __attribute__((unused))) .hash = opt_hash ?: DEFAULT_PLAIN_HASH, .skip = opt_skip, .offset = opt_offset, + .size = opt_size, }; char *password = NULL; 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")) @@ -237,9 +299,9 @@ static int action_create(int arg __attribute__((unused))) 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); @@ -262,22 +324,33 @@ static int action_create(int arg __attribute__((unused))) if (r < 0) goto out; + 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) - r = crypt_activate_by_keyfile(cd, action_argv[0], - CRYPT_ANY_SLOT, opt_key_file, key_size, - opt_readonly ? CRYPT_ACTIVATE_READONLY : 0); + /* With hashing, read the whole keyfile */ + 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, - opt_batch_mode ? 0 : opt_verify_passphrase, + _verify_passphrase(0), 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); + CRYPT_ANY_SLOT, password, passwordLen, activate_flags); } out: crypt_free(cd); @@ -295,6 +368,7 @@ static int action_loopaesOpen(int arg __attribute__((unused))) .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) { @@ -302,6 +376,12 @@ static int action_loopaesOpen(int arg __attribute__((unused))) 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; @@ -310,9 +390,9 @@ static int action_loopaesOpen(int arg __attribute__((unused))) if (r < 0) goto out; - r = crypt_activate_by_keyfile(cd, action_argv[1], - CRYPT_ANY_SLOT, opt_key_file, opt_keyfile_size, - opt_readonly ? CRYPT_ACTIVATE_READONLY : 0); + 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); @@ -337,7 +417,7 @@ static int action_resize(int arg __attribute__((unused))) struct crypt_device *cd = NULL; int r; - r = crypt_init_by_name(&cd, action_argv[0]); + r = crypt_init_by_name_and_header(&cd, action_argv[0], opt_header_device); if (r == 0) r = crypt_resize(cd, action_argv[0], opt_size); @@ -350,23 +430,37 @@ static int action_status(int arg __attribute__((unused))) crypt_status_info ci; struct crypt_active_device cad; struct crypt_device *cd = NULL; + struct stat st; char *backing_file; const char *device; - int r = 0; + int path = 0, r = 0; + + /* perhaps a path, not a dm device name */ + if (strchr(action_argv[0], '/') && !stat(action_argv[0], &st)) + path = 1; 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]); + if (path) + log_std("%s is inactive.\n", action_argv[0]); + else + log_std("%s/%s is inactive.\n", crypt_get_dir(), action_argv[0]); + r = -ENODEV; break; case CRYPT_ACTIVE: case CRYPT_BUSY: - log_std("%s/%s is active%s.\n", crypt_get_dir(), action_argv[0], - ci == CRYPT_BUSY ? " and is in use" : ""); - r = crypt_init_by_name(&cd, action_argv[0]); + if (path) + log_std("%s is active%s.\n", action_argv[0], + ci == CRYPT_BUSY ? " and is in use" : ""); + else + log_std("%s/%s is active%s.\n", crypt_get_dir(), action_argv[0], + ci == CRYPT_BUSY ? " and is in use" : ""); + + r = crypt_init_by_name_and_header(&cd, action_argv[0], opt_header_device); if (r < 0 || !crypt_get_type(cd)) goto out; @@ -391,9 +485,13 @@ static int action_status(int arg __attribute__((unused))) 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); + if (r == -ENOTSUP) + r = 0; return r; } @@ -423,9 +521,36 @@ fail: 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; + const char *header_device; char *msg = NULL, *key = NULL, cipher [MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN]; char *password = NULL; size_t passwordLen; @@ -433,9 +558,13 @@ static int action_luksFormat(int arg __attribute__((unused))) struct crypt_params_luks1 params = { .hash = opt_hash ?: DEFAULT_LUKS1_HASH, .data_alignment = opt_align_payload, + .data_device = opt_header_device ? action_argv[0] : NULL, }; - if(asprintf(&msg, _("This will overwrite data on %s irrevocably."), action_argv[0]) == -1) { + header_device = opt_header_device ?: action_argv[0]; + + if(asprintf(&msg, _("This will overwrite data on %s irrevocably."), + header_device) == -1) { log_err(_("memory allocation error in action_luksFormat")); r = -ENOMEM; goto out; @@ -448,19 +577,21 @@ static int action_luksFormat(int arg __attribute__((unused))) r = crypt_parse_name_and_mode(opt_cipher ?: DEFAULT_CIPHER(LUKS1), cipher, NULL, cipher_mode); if (r < 0) { - log_err("No known cipher specification pattern detected.\n"); + log_err(_("No known cipher specification pattern detected.\n")); goto out; } - if ((r = crypt_init(&cd, action_argv[0]))) + if ((r = crypt_init(&cd, header_device))) { + if (opt_header_device) + log_err(_("Cannot use %s as on-disk header.\n"), header_device); goto out; + } 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); + crypt_set_iteration_time(cd, opt_iteration_time); if (opt_random) crypt_set_rng_type(cd, CRYPT_RNG_RANDOM); @@ -468,8 +599,8 @@ static int action_luksFormat(int arg __attribute__((unused))) 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, - opt_batch_mode ? 0 : 1 /* always verify */, cd); + opt_keyfile_offset, opt_keyfile_size, opt_key_file, + opt_timeout, _verify_passphrase(1), cd); if (r < 0) goto out; @@ -498,39 +629,75 @@ out: static int action_luksOpen(int arg __attribute__((unused))) { struct crypt_device *cd = NULL; + const char *data_device, *header_device, *activated_name; + char *key = NULL; uint32_t flags = 0; - int r; + int r, keysize; - if ((r = crypt_init(&cd, action_argv[0]))) + if (opt_header_device) { + header_device = uuid_or_device(opt_header_device); + data_device = action_argv[0]; + } else { + header_device = uuid_or_device(action_argv[0]); + data_device = NULL; + } + + activated_name = opt_test_passphrase ? NULL : action_argv[1]; + + if ((r = crypt_init(&cd, header_device))) goto out; if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) goto out; + if (data_device && + (r = crypt_set_data_device(cd, data_device))) + goto out; + + if (!data_device && (crypt_get_data_offset(cd) < 8)) { + log_err(_("Reduced data offset is allowed only for detached LUKS header.\n")); + r = -EINVAL; + goto out; + } + crypt_set_timeout(cd, opt_timeout); crypt_set_password_retry(cd, opt_tries); + crypt_set_password_verify(cd, _verify_passphrase(0)); if (opt_iteration_time) - crypt_set_iterarion_time(cd, opt_iteration_time); + crypt_set_iteration_time(cd, opt_iteration_time); + if (opt_readonly) flags |= CRYPT_ACTIVATE_READONLY; - if (opt_key_file) { + if (opt_allow_discards) + flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS; + + if (opt_master_key_file) { + keysize = crypt_get_volume_key_size(cd); + r = _read_mk(opt_master_key_file, &key, keysize); + if (r < 0) + goto out; + r = crypt_activate_by_volume_key(cd, activated_name, + key, keysize, flags); + } else 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); + r = crypt_activate_by_keyfile_offset(cd, activated_name, + opt_key_slot, opt_key_file, opt_keyfile_size, + opt_keyfile_offset, flags); } else - r = crypt_activate_by_passphrase(cd, action_argv[1], - CRYPT_ANY_SLOT, NULL, 0, flags); + r = crypt_activate_by_passphrase(cd, activated_name, + opt_key_slot, NULL, 0, flags); out: + crypt_safe_free(key); crypt_free(cd); return r; } 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; @@ -542,8 +709,8 @@ static int verify_keyslot(struct crypt_device *cd, int key_slot, return -EPERM; r = crypt_get_key(msg_pass, &password, &passwordLen, - keyfile_size, key_file, opt_timeout, - opt_batch_mode ? 0 : opt_verify_passphrase, cd); + keyfile_offset, keyfile_size, key_file, opt_timeout, + _verify_passphrase(0), cd); if(r < 0) goto out; @@ -577,7 +744,7 @@ static int action_luksKillSlot(int arg __attribute__((unused))) 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); @@ -594,6 +761,7 @@ static int action_luksKillSlot(int arg __attribute__((unused))) case CRYPT_SLOT_INACTIVE: log_err(_("Key %d not active. Can't wipe.\n"), opt_key_slot); case CRYPT_SLOT_INVALID: + r = -EINVAL; goto out; } @@ -601,7 +769,7 @@ static int action_luksKillSlot(int arg __attribute__((unused))) 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; } @@ -619,7 +787,7 @@ static int action_luksRemoveKey(int arg __attribute__((unused))) 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); @@ -630,9 +798,9 @@ static int action_luksRemoveKey(int arg __attribute__((unused))) 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, - opt_batch_mode ? 0 : opt_verify_passphrase, + _verify_passphrase(0), cd); if(r < 0) goto out; @@ -667,7 +835,7 @@ static int action_luksAddKey(int arg __attribute__((unused))) 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); @@ -676,10 +844,11 @@ static int action_luksAddKey(int arg __attribute__((unused))) goto out; keysize = crypt_get_volume_key_size(cd); - crypt_set_password_verify(cd, opt_verify_passphrase ? 1 : 0); + /* FIXME: lib cannot properly set verification for new/old passphrase */ + crypt_set_password_verify(cd, _verify_passphrase(0)); crypt_set_timeout(cd, opt_timeout); if (opt_iteration_time) - crypt_set_iterarion_time(cd, opt_iteration_time); + crypt_set_iteration_time(cd, opt_iteration_time); if (opt_master_key_file) { r = _read_mk(opt_master_key_file, &key, keysize); @@ -689,9 +858,9 @@ static int action_luksAddKey(int arg __attribute__((unused))) 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); @@ -721,19 +890,19 @@ static int action_luksChangeKey(int arg __attribute__((unused))) 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))) goto out; if (opt_iteration_time) - crypt_set_iterarion_time(cd, opt_iteration_time); + crypt_set_iteration_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); + opt_keyfile_offset, opt_keyfile_size, opt_key_file, + opt_timeout, _verify_passphrase(0), cd); if (r < 0) goto out; @@ -769,8 +938,9 @@ static int action_luksChangeKey(int arg __attribute__((unused))) 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); + opt_new_keyfile_offset, opt_new_keyfile_size, + opt_new_key_file, + opt_timeout, _verify_passphrase(0), cd); if (r < 0) goto out; @@ -807,6 +977,7 @@ static int action_isLuks(int arg __attribute__((unused))) if ((r = crypt_init(&cd, action_argv[0]))) goto out; + crypt_set_log_callback(cd, _quiet_log, NULL); r = crypt_load(cd, CRYPT_LUKS1, NULL); out: crypt_free(cd); @@ -861,7 +1032,8 @@ static int luksDump_with_volume_key(struct crypt_device *cd) 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; @@ -896,7 +1068,7 @@ static int action_luksDump(int arg __attribute__((unused))) 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))) @@ -916,7 +1088,7 @@ static int action_luksSuspend(int arg __attribute__((unused))) struct crypt_device *cd = NULL; int r; - r = crypt_init_by_name(&cd, action_argv[0]); + r = crypt_init_by_name_and_header(&cd, action_argv[0], opt_header_device); if (!r) r = crypt_suspend(cd, action_argv[0]); @@ -929,15 +1101,16 @@ static int action_luksResume(int arg __attribute__((unused))) struct crypt_device *cd = NULL; int r; - if ((r = crypt_init_by_name(&cd, action_argv[0]))) + if ((r = crypt_init_by_name_and_header(&cd, action_argv[0], opt_header_device))) goto out; - if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) - goto out; + crypt_set_timeout(cd, opt_timeout); + crypt_set_password_retry(cd, opt_tries); + 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); @@ -956,7 +1129,7 @@ static int action_luksBackup(int arg __attribute__((unused))) 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); @@ -994,6 +1167,7 @@ static __attribute__ ((noreturn)) void usage(poptContext popt_context, poptPrintUsage(popt_context, stderr, 0); if (error) log_err("%s: %s\n", more, error); + poptFreeContext(popt_context); exit(exitcode); } @@ -1041,7 +1215,7 @@ static void help(poptContext popt_context, usage(popt_context, EXIT_SUCCESS, NULL, NULL); } -static void _dbg_version_and_cmd(int argc, char **argv) +static void _dbg_version_and_cmd(int argc, const char **argv) { int i; @@ -1091,7 +1265,7 @@ static int run_action(struct action_type *action) 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[] = { @@ -1113,7 +1287,9 @@ int main(int argc, char **argv) { "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") }, @@ -1127,12 +1303,16 @@ int main(int argc, char **argv) { "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 }, + { "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 }, POPT_TABLEEND }; poptContext popt_context; struct action_type *action; - char *aname; + const char *aname; int r; const char *null_action_argv[] = {NULL}; @@ -1142,17 +1322,21 @@ int main(int argc, char **argv) bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - popt_context = poptGetContext(PACKAGE, argc, (const char **)argv, - popt_options, 0); + crypt_fips_self_check(NULL); + + popt_context = poptGetContext(PACKAGE, argc, argv, popt_options, 0); poptSetOtherOptionHelp(popt_context, - N_("[OPTION...] ]")); + N_("[OPTION...] ")); while((r = poptGetNextOpt(popt_context)) > 0) { unsigned long long ull_value; char *endp; + errno = 0; ull_value = strtoull(popt_tmp, &endp, 0); - if (*endp || !*popt_tmp) + if (*endp || !*popt_tmp || + (errno == ERANGE && ull_value == ULLONG_MAX) || + (errno != 0 && ull_value == 0)) r = POPT_ERROR_BADNUMBER; switch(r) { @@ -1177,10 +1361,11 @@ int main(int argc, char **argv) poptBadOption(popt_context, POPT_BADOPTION_NOALIAS)); if (opt_version_mode) { log_std("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION); + poptFreeContext(popt_context); exit(EXIT_SUCCESS); } - if (!(aname = (char *)poptGetArg(popt_context))) + if (!(aname = poptGetArg(popt_context))) usage(popt_context, EXIT_FAILURE, _("Argument missing."), poptGetInvocationName(popt_context)); for(action = action_types; action->type; action++) @@ -1209,15 +1394,33 @@ int main(int argc, char **argv) /* 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, "loopaesOpen")) { + 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_test_passphrase && + strcmp(aname, "luksOpen")) + usage(popt_context, EXIT_FAILURE, + _("Option --test-passphrase is allowed only for luksOpen.\n"), + poptGetInvocationName(popt_context)); if (opt_key_size % 8) usage(popt_context, EXIT_FAILURE, @@ -1227,7 +1430,7 @@ int main(int argc, char **argv) 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))) + (opt_key_slot < 0 || opt_key_slot >= crypt_keyslot_max(CRYPT_LUKS1))) usage(popt_context, EXIT_FAILURE, _("Key slot is invalid."), poptGetInvocationName(popt_context)); @@ -1237,18 +1440,19 @@ int main(int argc, char **argv) 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) { + 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)); @@ -1257,6 +1461,10 @@ int main(int argc, char **argv) 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"), @@ -1273,5 +1481,7 @@ int main(int argc, char **argv) _dbg_version_and_cmd(argc, argv); } - return run_action(action); + r = run_action(action); + poptFreeContext(popt_context); + return r; }