* Copyright (C) 2004, Christophe Saout <christophe@saout.de>
* Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
* Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2012, Milan Broz
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
NULL, NULL,
key_size,
¶ms);
+ check_signal(&r);
if (r < 0)
goto out;
params.hash ? 0 : key_size, 0,
activate_flags);
else {
- r = crypt_get_key(_("Enter passphrase: "),
+ r = tools_get_key(_("Enter passphrase: "),
&password, &passwordLen,
opt_keyfile_offset, opt_keyfile_size,
NULL, opt_timeout,
- _verify_passphrase(0),
+ _verify_passphrase(0), 0,
cd);
if (r < 0)
goto out;
r = crypt_format(cd, CRYPT_LOOPAES, opt_cipher ?: DEFAULT_LOOPAES_CIPHER,
NULL, NULL, NULL, key_size, ¶ms);
+ check_signal(&r);
if (r < 0)
goto out;
goto out;
/* TCRYPT header is encrypted, get passphrase now */
- r = crypt_get_key(_("Enter passphrase: "),
+ r = tools_get_key(_("Enter passphrase: "),
CONST_CAST(char**)¶ms.passphrase,
¶ms.passphrase_size, 0, 0, NULL, opt_timeout,
- _verify_passphrase(0), cd);
+ _verify_passphrase(0), 0, cd);
if (r < 0)
goto out;
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
r = crypt_load(cd, CRYPT_TCRYPT, ¶ms);
+ check_signal(&r);
if (r < 0)
goto out;
goto out;
/* TCRYPT header is encrypted, get passphrase now */
- r = crypt_get_key(_("Enter passphrase: "),
+ r = tools_get_key(_("Enter passphrase: "),
CONST_CAST(char**)¶ms.passphrase,
¶ms.passphrase_size, 0, 0, NULL, opt_timeout,
- _verify_passphrase(0), cd);
+ _verify_passphrase(0), 0, cd);
if (r < 0)
goto out;
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;
r = crypt_load(cd, CRYPT_TCRYPT, ¶ms);
+ check_signal(&r);
if (r < 0)
goto out;
return r;
}
+static int action_benchmark_kdf(const char *hash)
+{
+ uint64_t kdf_iters;
+ int r;
+
+ r = crypt_benchmark_kdf(NULL, "pbkdf2", hash, "foo", 3, "bar", 3,
+ &kdf_iters);
+ if (r < 0)
+ log_std("PBKDF2-%-9s N/A\n", hash);
+ else
+ log_std("PBKDF2-%-9s %7" PRIu64 " iterations per second\n",
+ hash, kdf_iters);
+ return r;
+}
+
static int action_benchmark(void)
{
static struct {
{ "twofish", "xts", 64, 16 },
{ NULL, NULL, 0, 0 }
};
- const char *header = "# Tests are approximate using memory only (no storage IO).\n"
- "# Algorithm | Key | Encryption | Decryption\n";
+ static char *bkdfs[] = {
+ "sha1", "sha256", "sha512", "ripemd160", "whirlpool", NULL
+ };
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);
char *c;
int i, r;
- if (opt_cipher) {
+ log_std("# Tests are approximate using memory only (no storage IO).\n");
+ if (opt_hash) {
+ r = action_benchmark_kdf(opt_hash);
+ } else 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"));
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("%12s %4db %5.1f MiB/s %5.1f MiB/s\n",
- cipher, key_size, enc_mbr, dec_mbr);
+ log_std("# Algorithm | Key | Encryption | Decryption\n");
+ log_std("%8s-%s %4db %5.1f MiB/s %5.1f MiB/s\n",
+ cipher, cipher_mode, key_size, enc_mbr, dec_mbr);
} else if (r == -ENOENT)
log_err(_("Cipher %s is not available.\n"), opt_cipher);
} else {
+ for (i = 0; bkdfs[i]; i++) {
+ r = action_benchmark_kdf(bkdfs[i]);
+ check_signal(&r);
+ if (r == -EINTR)
+ break;
+ }
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);
- if (r == -ENOTSUP)
+ check_signal(&r);
+ if (r == -ENOTSUP || r == -EINTR)
break;
if (r == -ENOENT)
skipped++;
if (i == 0)
- log_std("%s", header);
+ log_std("# Algorithm | Key | Encryption | Decryption\n");
snprintf(cipher, MAX_CIPHER_LEN, "%s-%s",
bciphers[i].cipher, bciphers[i].mode);
else if (opt_urandom)
crypt_set_rng_type(cd, CRYPT_RNG_URANDOM);
- r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
+ r = tools_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
opt_keyfile_offset, opt_keyfile_size, opt_key_file,
- opt_timeout, _verify_passphrase(1), cd);
+ opt_timeout, _verify_passphrase(1), 1, cd);
if (r < 0)
goto out;
r = crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode,
opt_uuid, key, keysize, ¶ms);
+ check_signal(&r);
if (r < 0)
goto out;
if (ki == CRYPT_SLOT_ACTIVE_LAST && msg_last && !yesDialog(msg_last, NULL))
return -EPERM;
- r = crypt_get_key(msg_pass, &password, &passwordLen,
+ r = tools_get_key(msg_pass, &password, &passwordLen,
keyfile_offset, keyfile_size, key_file, opt_timeout,
- _verify_passphrase(0), cd);
+ _verify_passphrase(0), 0, cd);
if(r < 0)
goto out;
if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
goto out;
- r = crypt_get_key(_("Enter LUKS passphrase to be deleted: "),
+ r = tools_get_key(_("Enter LUKS passphrase to be deleted: "),
&password, &passwordLen,
opt_keyfile_offset, opt_keyfile_size, opt_key_file,
opt_timeout,
- _verify_passphrase(0),
+ _verify_passphrase(0), 0,
cd);
if(r < 0)
goto out;
r = crypt_activate_by_passphrase(cd, NULL, CRYPT_ANY_SLOT,
password, passwordLen, 0);
+ check_signal(&r);
if (r < 0)
goto out;
int r = -EINVAL, keysize = 0;
char *key = NULL;
const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
+ char *password = NULL, *password_new = NULL;
+ size_t password_size = 0, password_new_size = 0;
struct crypt_device *cd = NULL;
if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
opt_key_file, opt_keyfile_size, opt_keyfile_offset,
opt_new_key_file, opt_new_keyfile_size, opt_new_keyfile_offset);
} else {
+ r = tools_get_key(_("Enter any passphrase: "),
+ &password, &password_size, 0, 0, NULL,
+ opt_timeout, _verify_passphrase(0), 0, cd);
+
+ if (r < 0)
+ goto out;
+
+ /* Check password before asking for new one */
+ r = crypt_activate_by_passphrase(cd, NULL, CRYPT_ANY_SLOT,
+ password, password_size, 0);
+ check_signal(&r);
+ if (r < 0)
+ goto out;
+
+ r = tools_get_key(_("Enter new passphrase for key slot: "),
+ &password_new, &password_new_size, 0, 0, NULL,
+ opt_timeout, _verify_passphrase(0), 1, cd);
+ if (r < 0)
+ goto out;
+
r = crypt_keyslot_add_by_passphrase(cd, opt_key_slot,
- NULL, 0, NULL, 0);
+ password, password_size,
+ password_new, password_new_size);
}
out:
- crypt_free(cd);
+ crypt_safe_free(password);
+ crypt_safe_free(password_new);
crypt_safe_free(key);
+ crypt_free(cd);
return r;
}
-static int _slots_full(struct crypt_device *cd)
-{
- int i;
-
- for (i = 0; i < crypt_keyslot_max(crypt_get_type(cd)); i++)
- if (crypt_keyslot_status(cd, i) == CRYPT_SLOT_INACTIVE)
- return 0;
- return 1;
-}
-
static int action_luksChangeKey(void)
{
const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
struct crypt_device *cd = NULL;
- char *vk = NULL, *password = NULL;
- size_t passwordLen = 0;
- size_t vk_size;
- int new_key_slot, old_key_slot, r;
+ char *password = NULL, *password_new = NULL;
+ size_t password_size = 0, password_new_size = 0;
+ int r;
if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
goto out;
if (opt_iteration_time)
crypt_set_iteration_time(cd, opt_iteration_time);
- r = crypt_get_key(_("Enter LUKS passphrase to be changed: "),
- &password, &passwordLen,
+ r = tools_get_key(_("Enter LUKS passphrase to be changed: "),
+ &password, &password_size,
opt_keyfile_offset, opt_keyfile_size, opt_key_file,
- opt_timeout, _verify_passphrase(0), cd);
+ opt_timeout, _verify_passphrase(0), 0, cd);
if (r < 0)
goto out;
- vk_size = crypt_get_volume_key_size(cd);
- vk = crypt_safe_alloc(vk_size);
- if (!vk) {
- r = -ENOMEM;
- goto out;
- }
-
- r = crypt_volume_key_get(cd, opt_key_slot, vk, &vk_size,
- password, passwordLen);
- if (r < 0) {
- if (opt_key_slot != CRYPT_ANY_SLOT)
- log_err(_("No key available with this passphrase.\n"));
+ /* Check password before asking for new one */
+ r = crypt_activate_by_passphrase(cd, NULL, opt_key_slot,
+ password, password_size, 0);
+ check_signal(&r);
+ if (r < 0)
goto out;
- }
-
- if (opt_key_slot != CRYPT_ANY_SLOT || _slots_full(cd)) {
- log_dbg("Key slot %d is going to be overwritten (%s).",
- r, opt_key_slot != CRYPT_ANY_SLOT ?
- "explicit key slot specified" : "no free key slot");
- old_key_slot = r;
- new_key_slot = r;
- } else {
- log_dbg("Allocating new key slot.");
- old_key_slot = r;
- new_key_slot = CRYPT_ANY_SLOT;
- }
- crypt_safe_free(password);
- password = NULL;
- passwordLen = 0;
- r = crypt_get_key(_("Enter new LUKS passphrase: "),
- &password, &passwordLen,
+ r = tools_get_key(_("Enter new LUKS passphrase: "),
+ &password_new, &password_new_size,
opt_new_keyfile_offset, opt_new_keyfile_size,
opt_new_key_file,
- opt_timeout, _verify_passphrase(0), cd);
+ opt_timeout, _verify_passphrase(0), 1, cd);
if (r < 0)
goto out;
- if (new_key_slot == old_key_slot) {
- (void)crypt_keyslot_destroy(cd, old_key_slot);
- r = crypt_keyslot_add_by_volume_key(cd, new_key_slot,
- vk, vk_size,
- password, passwordLen);
- if (r >= 0)
- log_verbose(_("Key slot %d changed.\n"), r);
- } else {
- r = crypt_keyslot_add_by_volume_key(cd, CRYPT_ANY_SLOT,
- vk, vk_size,
- password, passwordLen);
- if (r >= 0) {
- log_verbose(_("Replaced with key slot %d.\n"), r);
- r = crypt_keyslot_destroy(cd, old_key_slot);
- }
- }
- if (r < 0)
- log_err(_("Failed to swap new key slot.\n"));
+ r = crypt_keyslot_change_by_passphrase(cd, opt_key_slot, opt_key_slot,
+ password, password_size, password_new, password_new_size);
out:
- crypt_safe_free(vk);
crypt_safe_free(password);
+ crypt_safe_free(password_new);
crypt_free(cd);
return r;
}
if (!vk)
return -ENOMEM;
- r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
+ r = tools_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
opt_keyfile_offset, opt_keyfile_size, opt_key_file,
- opt_timeout, 0, cd);
+ opt_timeout, 0, 0, cd);
if (r < 0)
goto out;
r = crypt_volume_key_get(cd, CRYPT_ANY_SLOT, vk, &vk_size,
password, passwordLen);
+ check_signal(&r);
if (r < 0)
goto out;
if (action->required_memlock)
crypt_memory_lock(NULL, 1);
+ set_int_handler(0);
r = action->handler();
if (action->required_memlock)
/* Some functions returns keyslot # */
if (r > 0)
r = 0;
+ check_signal(&r);
show_status(r);
return translate_errno(r);
{ "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 (hidden TCRYPT device) ."), NULL },
- { "type", 'M', POPT_ARG_STRING, &opt_type, 0, N_("Type of device metadata: luks, plain, loopaes, tcrypt."), NULL },
+ { "type", 'M', POPT_ARG_STRING, &opt_type, 0, N_("Type of device metadata: luks, plain, loopaes, tcrypt."), NULL },
+ { "force-password", '\0', POPT_ARG_NONE, &opt_force_password, 0, N_("Disable password quality check (if enabled)."), NULL },
POPT_TABLEEND
};
poptContext popt_context;
projects / platform / upstream / cryptsetup.git / blobdiff