X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcryptsetup.c;h=b520d40f56931d4472ba320ef4c35840bf6ee07e;hb=3cbb43a73a5504a4c4285394a4876eef202d7620;hp=b4758411aeca00ec8ee341b63e274930db1974bb;hpb=1b982af46f782fdd6b5d8e96b7c86539b55b267c;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/src/cryptsetup.c b/src/cryptsetup.c index b475841..b520d40 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 @@ -19,24 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "cryptsetup.h" -static int opt_verbose = 0; -static int opt_debug = 0; static const char *opt_cipher = NULL; static const char *opt_hash = NULL; static int opt_verify_passphrase = 0; @@ -48,6 +32,8 @@ 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; @@ -55,7 +41,6 @@ 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_version_mode = 0; static int opt_timeout = 0; static int opt_tries = 3; @@ -65,14 +50,18 @@ 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 int opt_hidden = 0; static const char **action_argv; static int action_argc; +static const char *null_action_argv[] = {NULL, NULL}; static int action_create(int arg); static int action_remove(int arg); static int action_resize(int arg); static int action_status(int arg); +static int action_benchmark(int arg); static int action_luksFormat(int arg); static int action_luksOpen(int arg); static int action_luksAddKey(int arg); @@ -87,6 +76,8 @@ 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 int action_tcryptOpen(int arg); static struct action_type { const char *type; @@ -101,6 +92,8 @@ 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") }, + { "benchmark", action_benchmark, 0, 0, 0, N_(""), N_("benchmark cipher") }, + { "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") }, @@ -117,114 +110,26 @@ static struct action_type { { "luksHeaderRestore",action_luksRestore,0,1, 1, N_(""), N_("Restore LUKS device header and keyslots") }, { "loopaesOpen",action_loopaesOpen, 0, 2, 1, N_(" "), N_("open loop-AES device as mapping ") }, { "loopaesClose",action_remove, 0, 1, 1, N_(""), N_("remove loop-AES mapping") }, + { "tcryptOpen", action_tcryptOpen, 0, 2, 1, N_(" "), N_("open TCRYPT device as 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, ...) -{ - 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); -} - -static int _yesDialog(const char *msg, void *usrptr __attribute__((unused))) -{ - char *answer = NULL; - size_t size = 0; - int r = 1; - - if(isatty(0) && !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) { - perror("getline"); - free(answer); - return 0; - } - if(strcmp(answer, "YES\n")) - r = 0; - free(answer); - } - - return r; -} - -static void _log(int level, const char *msg, void *usrptr __attribute__((unused))) -{ - 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; - 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; - } -} - -static void _quiet_log(int level, const char *msg, void *usrptr) +static int _verify_passphrase(int def) { - if (!opt_verbose && (level == CRYPT_LOG_ERROR || level == CRYPT_LOG_NORMAL)) - level = CRYPT_LOG_VERBOSE; - _log(level, msg, usrptr); -} - -static void show_status(int errcode) -{ - char error[256], *error_; - - 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)); - if (error_ != error) { - strncpy(error, error_, sizeof(error)); - error[sizeof(error) - 1] = '\0'; - } + /* 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; } - log_err(_("Command failed with code %i"), -errcode); - if (*error) - log_err(": %s\n", error); - else - log_err(".\n"); + return def; } static int action_create(int arg __attribute__((unused))) @@ -250,9 +155,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); @@ -286,14 +191,16 @@ static int action_create(int arg __attribute__((unused))) 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, - opt_batch_mode ? 0 : opt_verify_passphrase, + _verify_passphrase(0), cd); if (r < 0) goto out; @@ -339,14 +246,56 @@ 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, 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); return r; } +static int action_tcryptOpen(int arg __attribute__((unused))) +{ + struct crypt_device *cd = NULL; + struct crypt_params_tcrypt params = {}; + const char *activated_name; + uint32_t flags = 0; + int r; + + activated_name = opt_test_passphrase ? NULL : action_argv[1]; + + if ((r = crypt_init(&cd, action_argv[0]))) + goto out; + + /* TCRYPT header is encrypted, get passphrase now */ + r = crypt_get_key(_("Enter passphrase: "), + CONST_CAST(char**)¶ms.passphrase, + ¶ms.passphrase_size, + opt_keyfile_offset, opt_keyfile_size, + NULL, opt_timeout, + _verify_passphrase(0), + cd); + if (r < 0) + goto out; + + if (opt_hidden) + params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER; + + r = crypt_load(cd, CRYPT_TCRYPT, ¶ms); + if (r < 0) + goto out; + + if (opt_readonly) + flags |= CRYPT_ACTIVATE_READONLY; + + r = crypt_activate_by_volume_key(cd, activated_name, NULL, 0, flags); +out: + crypt_free(cd); + crypt_safe_free(CONST_CAST(char*)params.passphrase); + return r; +} + static int action_remove(int arg __attribute__((unused))) { struct crypt_device *cd = NULL; @@ -378,9 +327,14 @@ 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) { @@ -388,14 +342,22 @@ static int action_status(int arg __attribute__((unused))) 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; @@ -425,6 +387,84 @@ static int action_status(int arg __attribute__((unused))) } out: crypt_free(cd); + if (r == -ENOTSUP) + r = 0; + return r; +} + +static int action_benchmark(int arg __attribute__((unused))) +{ + static struct { + char *cipher; + char *mode; + size_t key_size; + size_t iv_size; + } bciphers[] = { + { "aes", "cbc", 16, 16 }, + { "serpent", "cbc", 16, 16 }, + { "twofish", "cbc", 16, 16 }, + { "aes", "cbc", 32, 16 }, + { "serpent", "cbc", 32, 16 }, + { "twofish", "cbc", 32, 16 }, + { "aes", "xts", 32, 16 }, + { "serpent", "xts", 32, 16 }, + { "twofish", "xts", 32, 16 }, + { "aes", "xts", 64, 16 }, + { "serpent", "xts", 64, 16 }, + { "twofish", "xts", 64, 16 }, + { NULL, NULL, 0, 0 } + }; + char *header = "# Tests are approximate using memory only (no storage IO).\n" + "# Algorithm | Key | Encryption | Decryption\n"; + char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN]; + double enc_mbr = 0, dec_mbr = 0; + int key_size = (opt_key_size ?: DEFAULT_PLAIN_KEYBITS); + int iv_size = 16; + int buffer_size = 1024 * 1024; + char *c; + int i, r; + + if (opt_cipher) { + r = crypt_parse_name_and_mode(opt_cipher, cipher, NULL, cipher_mode); + if (r < 0) { + log_err(_("No known cipher specification pattern detected.\n")); + return r; + } + if ((c = strchr(cipher_mode, '-'))) + *c = '\0'; + + /* FIXME: not really clever :) */ + if (strstr(cipher, "des")) + iv_size = 8; + + r = crypt_benchmark(NULL, cipher, cipher_mode, + key_size / 8, iv_size, buffer_size, + &enc_mbr, &dec_mbr); + if (!r) { + log_std("%s", header); + strncat(cipher, "-", MAX_CIPHER_LEN); + strncat(cipher, cipher_mode, MAX_CIPHER_LEN); + log_std("%11s %4db %5.1f MiB/s %5.1f MiB/s\n", + cipher, key_size, enc_mbr, dec_mbr); + } else + log_err(_("Cannot benchmark %s.\n"), cipher); + } else { + log_std("%s", header); + for (i = 0; bciphers[i].cipher; i++) { + r = crypt_benchmark(NULL, bciphers[i].cipher, bciphers[i].mode, + bciphers[i].key_size, bciphers[i].iv_size, + buffer_size, &enc_mbr, &dec_mbr); + snprintf(cipher, MAX_CIPHER_LEN, "%s-%s", + bciphers[i].cipher, bciphers[i].mode); + if (!r) + log_std("%11s %4db %5.1f MiB/s %5.1f MiB/s\n", + cipher, bciphers[i].key_size*8, enc_mbr, dec_mbr); + else + log_std("%11s %4db %12s %12s\n", cipher, + bciphers[i].key_size*8, _("N/A"), _("N/A")); + } + } + return r; } @@ -454,6 +494,32 @@ 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, tool_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; @@ -476,7 +542,7 @@ static int action_luksFormat(int arg __attribute__((unused))) r = -ENOMEM; goto out; } - r = _yesDialog(msg, NULL) ? 0 : -EINVAL; + r = yesDialog(msg, NULL) ? 0 : -EINVAL; free(msg); if (r < 0) goto out; @@ -496,7 +562,6 @@ static int action_luksFormat(int arg __attribute__((unused))) 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_iteration_time(cd, opt_iteration_time); @@ -507,8 +572,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; @@ -537,18 +602,21 @@ out: static int action_luksOpen(int arg __attribute__((unused))) { struct crypt_device *cd = NULL; - const char *data_device, *header_device; + const char *data_device, *header_device, *activated_name; + char *key = NULL; uint32_t flags = 0; - int r; + 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; } + activated_name = opt_test_passphrase ? NULL : action_argv[1]; + if ((r = crypt_init(&cd, header_device))) goto out; @@ -567,6 +635,7 @@ static int action_luksOpen(int arg __attribute__((unused))) 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_iteration_time(cd, opt_iteration_time); @@ -577,22 +646,31 @@ static int action_luksOpen(int arg __attribute__((unused))) if (opt_allow_discards) flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS; - if (opt_key_file) { + 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], + r = crypt_activate_by_keyfile_offset(cd, activated_name, opt_key_slot, opt_key_file, opt_keyfile_size, - flags); + opt_keyfile_offset, flags); } else - r = crypt_activate_by_passphrase(cd, action_argv[1], + 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; @@ -600,12 +678,12 @@ static int verify_keyslot(struct crypt_device *cd, int key_slot, int i, r; ki = crypt_keyslot_status(cd, key_slot); - if (ki == CRYPT_SLOT_ACTIVE_LAST && msg_last && !_yesDialog(msg_last, NULL)) + if (ki == CRYPT_SLOT_ACTIVE_LAST && msg_last && !yesDialog(msg_last, NULL)) 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; @@ -627,7 +705,7 @@ static int verify_keyslot(struct crypt_device *cd, int key_slot, } } - if (r < 0) + if (r == -EPERM) log_err(_("No key available with this passphrase.\n")); out: crypt_safe_free(password); @@ -639,10 +717,10 @@ 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); + crypt_set_confirm_callback(cd, yesDialog, NULL); crypt_set_timeout(cd, opt_timeout); if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) @@ -664,7 +742,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; } @@ -682,10 +760,10 @@ 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); + crypt_set_confirm_callback(cd, yesDialog, NULL); crypt_set_timeout(cd, opt_timeout); if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) @@ -693,9 +771,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; @@ -709,7 +787,7 @@ static int action_luksRemoveKey(int arg __attribute__((unused))) log_verbose(_("Key slot %d selected for deletion.\n"), opt_key_slot); if (crypt_keyslot_status(cd, opt_key_slot) == CRYPT_SLOT_ACTIVE_LAST && - !_yesDialog(_("This is the last keyslot. " + !yesDialog(_("This is the last keyslot. " "Device will become unusable after purging this key."), NULL)) { r = -EPERM; @@ -730,16 +808,17 @@ 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); + 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, 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_iteration_time(cd, opt_iteration_time); @@ -752,9 +831,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); @@ -784,7 +863,7 @@ 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))) @@ -795,8 +874,8 @@ static int action_luksChangeKey(int arg __attribute__((unused))) 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; @@ -832,8 +911,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; @@ -870,7 +950,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); + crypt_set_log_callback(cd, quiet_log, NULL); r = crypt_load(cd, CRYPT_LUKS1, NULL); out: crypt_free(cd); @@ -886,7 +966,7 @@ static int action_luksUUID(int arg __attribute__((unused))) if ((r = crypt_init(&cd, action_argv[0]))) goto out; - crypt_set_confirm_callback(cd, _yesDialog, NULL); + crypt_set_confirm_callback(cd, yesDialog, NULL); if ((r = crypt_load(cd, CRYPT_LUKS1, NULL))) goto out; @@ -911,8 +991,8 @@ static int luksDump_with_volume_key(struct crypt_device *cd) unsigned i; int r; - crypt_set_confirm_callback(cd, _yesDialog, NULL); - if (!_yesDialog( + crypt_set_confirm_callback(cd, yesDialog, NULL); + if (!yesDialog( _("LUKS header dump with volume key is sensitive information\n" "which allows access to encrypted partition without passphrase.\n" "This dump should be always stored encrypted on safe place."), @@ -925,7 +1005,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; @@ -960,7 +1041,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))) @@ -998,10 +1079,11 @@ static int action_luksResume(int arg __attribute__((unused))) 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); @@ -1020,10 +1102,10 @@ 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); + crypt_set_confirm_callback(cd, yesDialog, NULL); r = crypt_header_backup(cd, CRYPT_LUKS1, opt_header_backup_file); out: @@ -1044,24 +1126,13 @@ static int action_luksRestore(int arg __attribute__((unused))) if ((r = crypt_init(&cd, action_argv[0]))) goto out; - crypt_set_confirm_callback(cd, _yesDialog, 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 __attribute__ ((noreturn)) void usage(poptContext popt_context, - int exitcode, const char *error, - const char *more) -{ - poptPrintUsage(popt_context, stderr, 0); - if (error) - log_err("%s: %s\n", more, error); - poptFreeContext(popt_context); - exit(exitcode); -} - static void help(poptContext popt_context, enum poptCallbackReason reason __attribute__((unused)), struct poptOption *key, @@ -1106,19 +1177,6 @@ static void help(poptContext popt_context, usage(popt_context, EXIT_SUCCESS, NULL, NULL); } -static void _dbg_version_and_cmd(int argc, const char **argv) -{ - int i; - - log_std("# %s %s processing \"", PACKAGE_NAME, PACKAGE_VERSION); - for (i = 0; i < argc; i++) { - if (i) - log_std(" "); - log_std("%s", argv[i]); - } - log_std("\"\n"); -} - static int run_action(struct action_type *action) { int r; @@ -1138,22 +1196,7 @@ static int run_action(struct action_type *action) r = 0; show_status(r); - - /* Translate exit code to simple codes */ - switch (r) { - case 0: r = EXIT_SUCCESS; break; - case -EEXIST: - case -EBUSY: r = 5; break; - case -ENOTBLK: - case -ENODEV: r = 4; break; - case -ENOMEM: r = 3; break; - case -EPERM: r = 2; break; - case -EINVAL: - case -ENOENT: - case -ENOSYS: - default: r = EXIT_FAILURE; - } - return r; + return translate_errno(r); } int main(int argc, const char **argv) @@ -1178,7 +1221,9 @@ int main(int argc, const 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") }, @@ -1196,23 +1241,26 @@ int main(int argc, const char **argv) { "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 }, + { "hidden", '\0', POPT_ARG_NONE, &opt_hidden, 0, N_("Use hidden header (hiden TCRYPT device) ."), NULL }, POPT_TABLEEND }; poptContext popt_context; struct action_type *action; const char *aname; int r; - const char *null_action_argv[] = {NULL}; - crypt_set_log_callback(NULL, _log, NULL); + crypt_set_log_callback(NULL, tool_log, NULL); setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); + crypt_fips_self_check(NULL); + popt_context = poptGetContext(PACKAGE, argc, argv, popt_options, 0); poptSetOtherOptionHelp(popt_context, - N_("[OPTION...] ]")); + _("[OPTION...] ")); while((r = poptGetNextOpt(popt_context)) > 0) { unsigned long long ull_value; @@ -1280,30 +1328,34 @@ int main(int argc, const char **argv) /* FIXME: rewrite this from scratch */ - if (opt_shared && strcmp(aname, "create")) { + 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")) { + 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") && + strcmp(aname, "benchmark")) usage(popt_context, EXIT_FAILURE, - _("Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n" + _("Option --key-size is allowed only for luksFormat, create, loopaesOpen and benchmark.\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, @@ -1326,15 +1378,16 @@ int main(int argc, const char **argv) 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)); @@ -1343,6 +1396,10 @@ int main(int argc, const 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"), @@ -1353,10 +1410,15 @@ int main(int argc, const char **argv) _("Option --offset is supported only for create and loopaesOpen commands.\n"), poptGetInvocationName(popt_context)); + if (opt_hidden && strcmp(aname, "tcryptOpen")) + usage(popt_context, EXIT_FAILURE, + _("Option --hidden is supported only for tcryptOpen command.\n"), + poptGetInvocationName(popt_context)); + if (opt_debug) { opt_verbose = 1; crypt_set_debug_level(-1); - _dbg_version_and_cmd(argc, argv); + dbg_version_and_cmd(argc, argv); } r = run_action(action);