+/*
+ * libcryptsetup - cryptsetup library
+ *
+ * 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.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include "libcryptsetup.h"
#include "luks.h"
#include "loopaes.h"
+#include "verity.h"
+#include "tcrypt.h"
#include "internal.h"
-#include "crypto_backend.h"
struct crypt_device {
char *type;
- char *device;
+ struct device *device;
+ struct device *metadata_device;
+
struct volume_key *volume_key;
uint64_t timeout;
uint64_t iteration_time;
int password_verify;
int rng_type;
- /* used in CRYPT_LUKS1 */
- struct luks_phdr hdr;
- uint64_t PBKDF2_per_sec;
-
- /* used in CRYPT_PLAIN */
- struct crypt_params_plain plain_hdr;
- char *plain_cipher;
- char *plain_cipher_mode;
- char *plain_uuid;
-
- /* used in CRYPT_LOOPAES */
- struct crypt_params_loopaes loopaes_hdr;
- char *loopaes_cipher;
- char *loopaes_cipher_mode;
- char *loopaes_uuid;
- unsigned int loopaes_key_size;
+ // FIXME: private binary headers and access it properly
+ // through sub-library (LUKS1, TCRYPT)
+
+ union {
+ struct { /* used in CRYPT_LUKS1 */
+ struct luks_phdr hdr;
+ uint64_t PBKDF2_per_sec;
+ } luks1;
+ struct { /* used in CRYPT_PLAIN */
+ struct crypt_params_plain hdr;
+ char *cipher;
+ char *cipher_mode;
+ char *uuid;
+ unsigned int key_size;
+ } plain;
+ struct { /* used in CRYPT_LOOPAES */
+ struct crypt_params_loopaes hdr;
+ char *cipher;
+ char *cipher_mode;
+ char *uuid;
+ unsigned int key_size;
+ } loopaes;
+ struct { /* used in CRYPT_VERITY */
+ struct crypt_params_verity hdr;
+ char *root_hash;
+ unsigned int root_hash_size;
+ char *uuid;
+ } verity;
+ struct { /* used in CRYPT_TCRYPT */
+ struct crypt_params_tcrypt params;
+ struct tcrypt_phdr hdr;
+ } tcrypt;
+ } u;
/* callbacks definitions */
void (*log)(int level, const char *msg, void *usrptr);
void *confirm_usrptr;
int (*password)(const char *msg, char *buf, size_t length, void *usrptr);
void *password_usrptr;
+
+ /* last error message */
+ char error[MAX_ERROR_LENGTH];
};
+/* Global error */
+/* FIXME: not thread safe, remove this later */
+static char global_error[MAX_ERROR_LENGTH] = {0};
+
/* Log helper */
static void (*_default_log)(int level, const char *msg, void *usrptr) = NULL;
static int _debug_level = 0;
_debug_level = level;
}
-int crypt_get_debug_level()
+int crypt_get_debug_level(void)
{
return _debug_level;
}
+static void crypt_set_error(struct crypt_device *cd, const char *error)
+{
+ size_t size = strlen(error);
+
+ /* Set global error, ugly hack... */
+ strncpy(global_error, error, MAX_ERROR_LENGTH - 2);
+ if (size < MAX_ERROR_LENGTH && global_error[size - 1] == '\n')
+ global_error[size - 1] = '\0';
+
+ /* Set error string per context */
+ if (cd) {
+ strncpy(cd->error, error, MAX_ERROR_LENGTH - 2);
+ if (size < MAX_ERROR_LENGTH && cd->error[size - 1] == '\n')
+ cd->error[size - 1] = '\0';
+ }
+}
+
void crypt_log(struct crypt_device *cd, int level, const char *msg)
{
if (cd && cd->log)
cd->log(level, msg, cd->log_usrptr);
else if (_default_log)
_default_log(level, msg, NULL);
+
+ if (level == CRYPT_LOG_ERROR)
+ crypt_set_error(cd, msg);
}
+__attribute__((format(printf, 5, 6)))
void logger(struct crypt_device *cd, int level, const char *file,
int line, const char *format, ...)
{
va_start(argp, format);
- if (vasprintf(&target, format, argp) > 0) {
+ if (vasprintf(&target, format, argp) > 0 ) {
if (level >= 0) {
crypt_log(cd, level, target);
#ifdef CRYPT_DEBUG
free(target);
}
-static int init_crypto(struct crypt_device *ctx)
+static const char *mdata_device_path(struct crypt_device *cd)
+{
+ return device_path(cd->metadata_device ?: cd->device);
+}
+
+/* internal only */
+struct device *crypt_metadata_device(struct crypt_device *cd)
+{
+ return cd->metadata_device ?: cd->device;
+}
+
+struct device *crypt_data_device(struct crypt_device *cd)
+{
+ return cd->device;
+}
+
+int init_crypto(struct crypt_device *ctx)
{
int r;
+ crypt_fips_libcryptsetup_check(ctx);
+
r = crypt_random_init(ctx);
if (r < 0) {
log_err(ctx, _("Cannot initialize crypto RNG backend.\n"));
if (r < 0)
log_err(ctx, _("Cannot initialize crypto backend.\n"));
+ log_dbg("Crypto backend (%s) initialized.", crypt_backend_version());
return r;
}
-/*
- * Password processing behaviour matrix of process_key
- *
- * from binary file: check if there is sufficently large key material
- * interactive & from fd: hash if requested, otherwise crop or pad with '0'
- */
-static char *process_key(struct crypt_device *cd, const char *hash_name,
- const char *key_file, size_t key_size,
- const char *pass, size_t passLen)
+static int process_key(struct crypt_device *cd, const char *hash_name,
+ size_t key_size, const char *pass, size_t passLen,
+ struct volume_key **vk)
{
- char *key;
+ int r;
if (!key_size)
- return NULL;
-
- key = crypt_safe_alloc(key_size);
- memset(key, 0, key_size);
-
- /* key is coming from binary file */
- if (key_file && strcmp(key_file, "-")) {
- if(passLen < key_size) {
- log_err(cd, _("Cannot not read %d bytes from key file %s.\n"),
- key_size, key_file);
- crypt_safe_free(key);
- return NULL;
- }
- memcpy(key, pass, key_size);
- return key;
- }
+ return -EINVAL;
+
+ *vk = crypt_alloc_volume_key(key_size, NULL);
+ if (!*vk)
+ return -ENOMEM;
- /* key is coming from tty, fd or binary stdin */
if (hash_name) {
- if (crypt_plain_hash(cd, hash_name, key, key_size, pass, passLen) < 0) {
- log_err(cd, _("Key processing error (using hash algorithm %s).\n"),
- hash_name);
- crypt_safe_free(key);
- return NULL;
+ r = crypt_plain_hash(cd, hash_name, (*vk)->key, key_size, pass, passLen);
+ if (r < 0) {
+ if (r == -ENOENT)
+ log_err(cd, _("Hash algorithm %s not supported.\n"),
+ hash_name);
+ else
+ log_err(cd, _("Key processing error (using hash %s).\n"),
+ hash_name);
+ crypt_free_volume_key(*vk);
+ *vk = NULL;
+ return -EINVAL;
}
} else if (passLen > key_size) {
- memcpy(key, pass, key_size);
+ memcpy((*vk)->key, pass, key_size);
} else {
- memcpy(key, pass, passLen);
+ memcpy((*vk)->key, pass, passLen);
}
- return key;
+ return 0;
}
static int isPLAIN(const char *type)
return (type && !strcmp(CRYPT_LOOPAES, type));
}
+static int isVERITY(const char *type)
+{
+ return (type && !strcmp(CRYPT_VERITY, type));
+}
+
+static int isTCRYPT(const char *type)
+{
+ return (type && !strcmp(CRYPT_TCRYPT, type));
+}
+
/* keyslot helpers */
static int keyslot_verify_or_find_empty(struct crypt_device *cd, int *keyslot)
{
if (*keyslot == CRYPT_ANY_SLOT) {
- *keyslot = LUKS_keyslot_find_empty(&cd->hdr);
+ *keyslot = LUKS_keyslot_find_empty(&cd->u.luks1.hdr);
if (*keyslot < 0) {
log_err(cd, _("All key slots full.\n"));
return -EINVAL;
}
}
- switch (LUKS_keyslot_info(&cd->hdr, *keyslot)) {
+ switch (LUKS_keyslot_info(&cd->u.luks1.hdr, *keyslot)) {
case CRYPT_SLOT_INVALID:
log_err(cd, _("Key slot %d is invalid, please select between 0 and %d.\n"),
*keyslot, LUKS_NUMKEYS - 1);
return 0;
}
-static int verify_other_keyslot(struct crypt_device *cd,
- const char *key_file,
- int keyIndex)
+/*
+ * compares UUIDs returned by device-mapper (striped by cryptsetup) and uuid in header
+ */
+static int crypt_uuid_cmp(const char *dm_uuid, const char *hdr_uuid)
{
- struct volume_key *vk = NULL;
- crypt_keyslot_info ki;
- int openedIndex, r;
- char *password = NULL;
- unsigned int passwordLen;
-
- r = crypt_get_key(_("Enter any remaining LUKS passphrase: "),
- &password, &passwordLen, 0, key_file, cd->timeout,
- cd->password_verify, cd);
- if(r < 0)
- goto out;
+ int i, j;
+ char *str;
- ki = crypt_keyslot_status(cd, keyIndex);
- if (ki == CRYPT_SLOT_ACTIVE) /* Not last slot */
- LUKS_keyslot_set(&cd->hdr, keyIndex, 0);
+ if (!dm_uuid || !hdr_uuid)
+ return -EINVAL;
- openedIndex = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT,
- password, passwordLen,
- &cd->hdr, &vk, cd);
+ str = strchr(dm_uuid, '-');
+ if (!str)
+ return -EINVAL;
- if (ki == CRYPT_SLOT_ACTIVE)
- LUKS_keyslot_set(&cd->hdr, keyIndex, 1);
+ for (i = 0, j = 1; hdr_uuid[i]; i++) {
+ if (hdr_uuid[i] == '-')
+ continue;
- if (openedIndex < 0)
- r = -EPERM;
- else
- log_verbose(cd, _("Key slot %d verified.\n"), openedIndex);
-out:
- crypt_free_volume_key(vk);
- crypt_safe_free(password);
- return r;
-}
-
-static int find_keyslot_by_passphrase(struct crypt_device *cd,
- const char *key_file,
- char *message)
-{
- struct volume_key *vk = NULL;
- char *password = NULL;
- unsigned int passwordLen;
- int r;
+ if (!str[j] || str[j] == '-')
+ return -EINVAL;
- r = crypt_get_key(message,&password,&passwordLen, 0, key_file,
- cd->timeout, cd->password_verify, cd);
- if (r < 0)
- goto out;
+ if (str[j] != hdr_uuid[i])
+ return -EINVAL;
+ j++;
+ }
- r = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT, password,
- passwordLen, &cd->hdr, &vk, cd);
-out:
- crypt_free_volume_key(vk);
- crypt_safe_free(password);
- return r;
+ return 0;
}
-static int luks_remove_helper(struct crypt_device *cd,
- int key_slot,
- const char *other_key_file,
- const char *key_file,
- int verify)
+int PLAIN_activate(struct crypt_device *cd,
+ const char *name,
+ struct volume_key *vk,
+ uint64_t size,
+ uint32_t flags)
{
- crypt_keyslot_info ki;
- int r = -EINVAL;
-
- if (key_slot == CRYPT_ANY_SLOT) {
- key_slot = find_keyslot_by_passphrase(cd, key_file,
- _("Enter LUKS passphrase to be deleted: "));
- if(key_slot < 0) {
- r = -EPERM;
- goto out;
+ int r;
+ char *dm_cipher = NULL;
+ enum devcheck device_check;
+ struct crypt_dm_active_device dmd = {
+ .target = DM_CRYPT,
+ .uuid = crypt_get_uuid(cd),
+ .size = size,
+ .flags = flags,
+ .data_device = crypt_data_device(cd),
+ .u.crypt = {
+ .cipher = NULL,
+ .vk = vk,
+ .offset = crypt_get_data_offset(cd),
+ .iv_offset = crypt_get_iv_offset(cd),
}
+ };
- log_std(cd, _("Key slot %d selected for deletion.\n"), key_slot);
- }
-
- ki = crypt_keyslot_status(cd, key_slot);
- if (ki == CRYPT_SLOT_INVALID) {
- log_err(cd, _("Key slot %d is invalid, please select between 0 and %d.\n"),
- key_slot, LUKS_NUMKEYS - 1);
- r = -EINVAL;
- goto out;
- }
- if (ki <= CRYPT_SLOT_INACTIVE) {
- log_err(cd, _("Key %d not active. Can't wipe.\n"), key_slot);
- r = -EINVAL;
- goto out;
- }
-
- if (ki == CRYPT_SLOT_ACTIVE_LAST && cd->confirm &&
- !(cd->confirm(_("This is the last keyslot."
- " Device will become unusable after purging this key."),
- cd->confirm_usrptr))) {
- r = -EINVAL;
- goto out;
- }
-
- if(verify)
- r = verify_other_keyslot(cd, other_key_file, key_slot);
+ if (dmd.flags & CRYPT_ACTIVATE_SHARED)
+ device_check = DEV_SHARED;
else
- r = 0;
+ device_check = DEV_EXCL;
- if (!r)
- r = crypt_keyslot_destroy(cd, key_slot);
-out:
- return (r < 0) ? r : 0;
-}
-
-static int create_device_helper(struct crypt_device *cd,
- const char *name,
- const char *hash,
- const char *cipher,
- const char *cipher_mode,
- const char *key_file,
- const char *key,
- unsigned int keyLen,
- int key_size,
- uint64_t size,
- uint64_t skip,
- uint64_t offset,
- const char *uuid,
- int read_only,
- unsigned int flags,
- int reload)
-{
- crypt_status_info ci;
- char *dm_cipher = NULL;
- char *processed_key = NULL;
- int r;
-
- if (!name)
- return -EINVAL;
-
- ci = crypt_status(cd, name);
- if (ci == CRYPT_INVALID)
- return -EINVAL;
-
- if (reload && ci < CRYPT_ACTIVE)
- return -EINVAL;
-
- if (!reload && ci >= CRYPT_ACTIVE) {
- log_err(cd, _("Device %s already exists.\n"), name);
- return -EEXIST;
- }
-
- if (key_size < 0 || key_size > 1024) {
- log_err(cd, _("Invalid key size %d.\n"), key_size);
- return -EINVAL;
- }
-
- r = device_check_and_adjust(cd, cd->device, !reload, &size, &offset, &read_only);
+ r = device_block_adjust(cd, dmd.data_device, device_check,
+ dmd.u.crypt.offset, &dmd.size, &dmd.flags);
if (r)
return r;
- if (cipher_mode && asprintf(&dm_cipher, "%s-%s", cipher, cipher_mode) < 0)
+ if (crypt_get_cipher_mode(cd))
+ r = asprintf(&dm_cipher, "%s-%s", crypt_get_cipher(cd), crypt_get_cipher_mode(cd));
+ else
+ r = asprintf(&dm_cipher, "%s", crypt_get_cipher(cd));
+ if (r < 0)
return -ENOMEM;
- processed_key = process_key(cd, hash, key_file, key_size, key, keyLen);
- if (!processed_key) {
- r = -ENOENT;
- goto out;
- }
+ dmd.u.crypt.cipher = dm_cipher;
+ log_dbg("Trying to activate PLAIN device %s using cipher %s.",
+ name, dmd.u.crypt.cipher);
- r = dm_create_device(name, cd->device, dm_cipher ?: cipher, cd->type, uuid, size, skip, offset,
- key_size, processed_key, read_only, reload);
-out:
- free(dm_cipher);
- crypt_safe_free(processed_key);
- return r;
-}
-
-static int open_from_hdr_and_vk(struct crypt_device *cd,
- struct volume_key *vk,
- const char *name,
- uint32_t flags)
-{
- uint64_t size, offset;
- char *cipher;
- int read_only, no_uuid, r;
+ r = dm_create_device(cd, name, CRYPT_PLAIN, &dmd, 0);
- size = 0;
- offset = crypt_get_data_offset(cd);
- read_only = flags & CRYPT_ACTIVATE_READONLY;
- no_uuid = flags & CRYPT_ACTIVATE_NO_UUID;
-
- r = device_check_and_adjust(cd, cd->device, 1, &size, &offset, &read_only);
- if (r)
- return r;
+ // FIXME
+ if (!cd->u.plain.uuid && dm_query_device(cd, name, DM_ACTIVE_UUID, &dmd) >= 0)
+ cd->u.plain.uuid = CONST_CAST(char*)dmd.uuid;
- if (asprintf(&cipher, "%s-%s", crypt_get_cipher(cd),
- crypt_get_cipher_mode(cd)) < 0)
- r = -ENOMEM;
- else
- r = dm_create_device(name, cd->device, cipher, cd->type,
- no_uuid ? NULL : crypt_get_uuid(cd),
- size, 0, offset, vk->keylength, vk->key,
- read_only, 0);
- free(cipher);
+ free(dm_cipher);
return r;
}
-static void log_wrapper(int level, const char *msg, void *usrptr)
-{
- void (*xlog)(int level, char *msg) = usrptr;
- xlog(level, (char *)msg);
-}
-
-static int yesDialog_wrapper(const char *msg, void *usrptr)
-{
- int (*xyesDialog)(char *msg) = usrptr;
- return xyesDialog((char*)msg);
-}
-
int crypt_confirm(struct crypt_device *cd, const char *msg)
{
if (!cd || !cd->confirm)
}
static int key_from_terminal(struct crypt_device *cd, char *msg, char **key,
- unsigned int *key_len, int force_verify)
+ size_t *key_len, int force_verify)
{
- char *prompt = NULL;
+ char *prompt = NULL, *device_name;
int r;
*key = NULL;
- if(!msg && asprintf(&prompt, _("Enter passphrase for %s: "),
- cd->device) < 0)
- return -ENOMEM;
-
- if (!msg)
+ if(!msg) {
+ if (crypt_loop_device(crypt_get_device_name(cd)))
+ device_name = crypt_loop_backing_file(crypt_get_device_name(cd));
+ else
+ device_name = strdup(crypt_get_device_name(cd));
+ if (!device_name)
+ return -ENOMEM;
+ r = asprintf(&prompt, _("Enter passphrase for %s: "), device_name);
+ free(device_name);
+ if (r < 0)
+ return -ENOMEM;
msg = prompt;
+ }
if (cd->password) {
- *key = crypt_safe_alloc(MAX_TTY_PASSWORD_LEN);
+ *key = crypt_safe_alloc(DEFAULT_PASSPHRASE_SIZE_MAX);
if (!*key) {
r = -ENOMEM;
goto out;
}
- r = cd->password(msg, *key, MAX_TTY_PASSWORD_LEN, cd->password_usrptr);
+ r = cd->password(msg, *key, DEFAULT_PASSPHRASE_SIZE_MAX,
+ cd->password_usrptr);
if (r < 0) {
crypt_safe_free(*key);
*key = NULL;
} else
*key_len = r;
} else
- r = crypt_get_key(msg, key, key_len, 0, NULL, cd->timeout,
+ r = crypt_get_key(msg, key, key_len, 0, 0, NULL, cd->timeout,
(force_verify || cd->password_verify), cd);
out:
free(prompt);
struct volume_key **vk)
{
char *passphrase_read = NULL;
- unsigned int passphrase_size_read;
- int r = -EINVAL, tries = cd->tries;
+ size_t passphrase_size_read;
+ int r = -EINVAL, eperm = 0, tries = cd->tries;
*vk = NULL;
do {
r = key_from_terminal(cd, NULL, &passphrase_read,
&passphrase_size_read, 0);
+ /* Continue if it is just passphrase verify mismatch */
+ if (r == -EPERM)
+ continue;
if(r < 0)
goto out;
- r = LUKS_open_key_with_hdr(cd->device, keyslot, passphrase_read,
- passphrase_size_read, &cd->hdr, vk, cd);
+ r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
+ passphrase_size_read, &cd->u.luks1.hdr, vk, cd);
+ if (r == -EPERM)
+ eperm = 1;
crypt_safe_free(passphrase_read);
passphrase_read = NULL;
} while (r == -EPERM && (--tries > 0));
if (r < 0) {
crypt_free_volume_key(*vk);
*vk = NULL;
+
+ /* Report wrong passphrase if at least one try failed */
+ if (eperm && r == -EPIPE)
+ r = -EPERM;
}
crypt_safe_free(passphrase_read);
}
static int key_from_file(struct crypt_device *cd, char *msg,
- char **key, unsigned int *key_len,
- const char *key_file, size_t key_size)
+ char **key, size_t *key_len,
+ const char *key_file, size_t key_offset,
+ size_t key_size)
{
- return crypt_get_key(msg, key, key_len, key_size, key_file,
+ return crypt_get_key(msg, key, key_len, key_offset, key_size, key_file,
cd->timeout, 0, cd);
}
-static int _crypt_init(struct crypt_device **cd,
- const char *type,
- struct crypt_options *options,
- int load, int need_dm)
-{
- int init_by_name, r;
-
- /* if it is plain device and mapping table is being reloaded
- initialize it by name*/
- init_by_name = (type && !strcmp(type, CRYPT_PLAIN) && load);
-
- /* Some of old API calls do not require DM in kernel,
- fake initialisation by initialise it with kernel_check disabled */
- if (!need_dm)
- (void)dm_init(NULL, 0);
- if (init_by_name)
- r = crypt_init_by_name(cd, options->name);
- else
- r = crypt_init(cd, options->device);
- if (!need_dm)
- dm_exit();
-
- if (r)
- return -EINVAL;
-
- crypt_set_log_callback(*cd, log_wrapper, options->icb->log);
- crypt_set_confirm_callback(*cd, yesDialog_wrapper, options->icb->yesDialog);
-
- crypt_set_timeout(*cd, options->timeout);
- crypt_set_password_retry(*cd, options->tries);
- crypt_set_iterarion_time(*cd, options->iteration_time ?: 1000);
- crypt_set_password_verify(*cd, options->flags & CRYPT_FLAG_VERIFY);
-
- if (load && !init_by_name)
- r = crypt_load(*cd, type, NULL);
-
- if (!r && type && !(*cd)->type) {
- (*cd)->type = strdup(type);
- if (!(*cd)->type)
- r = -ENOMEM;
- }
-
- if (r)
- crypt_free(*cd);
-
- return r;
-}
-
void crypt_set_log_callback(struct crypt_device *cd,
void (*log)(int level, const char *msg, void *usrptr),
void *usrptr)
cd->password_usrptr = usrptr;
}
-/* OPTIONS: name, cipher, device, hash, key_file, key_size, key_slot,
- * offset, size, skip, timeout, tries, passphrase_fd (ignored),
- * flags, icb */
-static int crypt_create_and_update_device(struct crypt_options *options, int update)
+static void _get_error(char *error, char *buf, size_t size)
{
- struct crypt_device *cd = NULL;
- char *key = NULL;
- unsigned int keyLen;
- int r;
-
- r = _crypt_init(&cd, CRYPT_PLAIN, options, 0, 1);
- if (r)
- return r;
-
- r = crypt_get_key(_("Enter passphrase: "), &key, &keyLen, options->key_size,
- options->key_file, cd->timeout, cd->password_verify, cd);
- if (!r)
- r = create_device_helper(cd, options->name, options->hash,
- options->cipher, NULL, options->key_file, key, keyLen,
- options->key_size, options->size, options->skip,
- options->offset, NULL, options->flags & CRYPT_FLAG_READONLY,
- options->flags, update);
-
- crypt_safe_free(key);
- crypt_free(cd);
- return r;
+ if (!buf || size < 1)
+ error[0] = '\0';
+ else if (*error) {
+ strncpy(buf, error, size - 1);
+ buf[size - 1] = '\0';
+ error[0] = '\0';
+ } else
+ buf[0] = '\0';
}
-int crypt_create_device(struct crypt_options *options)
+void crypt_last_error(struct crypt_device *cd, char *buf, size_t size)
{
- return crypt_create_and_update_device(options, 0);
+ if (cd)
+ return _get_error(cd->error, buf, size);
}
-int crypt_update_device(struct crypt_options *options)
+/* Deprecated global error interface */
+void crypt_get_error(char *buf, size_t size)
{
- return crypt_create_and_update_device(options, 1);
+ return _get_error(global_error, buf, size);
}
-/* OPTIONS: name, size, icb */
-int crypt_resize_device(struct crypt_options *options)
+const char *crypt_get_dir(void)
{
- struct crypt_device *cd = NULL;
- char *device = NULL, *cipher = NULL, *uuid = NULL, *key = NULL;
- char *type = NULL;
- uint64_t size, skip, offset;
- int key_size, read_only, r;
+ return dm_get_dir();
+}
- log_dbg("Resizing device %s to %" PRIu64 " sectors.", options->name, options->size);
+int crypt_init(struct crypt_device **cd, const char *device)
+{
+ struct crypt_device *h = NULL;
+ int r;
- if (dm_init(NULL, 1) < 0)
- return -ENOSYS;
+ if (!cd)
+ return -EINVAL;
- r = dm_query_device(options->name, &device, &size, &skip, &offset,
- &cipher, &key_size, &key, &read_only, NULL, &uuid);
- if (r < 0) {
- log_err(NULL, _("Device %s is not active.\n"), options->name);
- goto out;
- }
+ log_dbg("Allocating crypt device %s context.", device);
- /* Try to determine type of device from UUID */
- type = CRYPT_PLAIN;
- if (uuid) {
- if (!strncmp(uuid, CRYPT_PLAIN, strlen(CRYPT_PLAIN))) {
- type = CRYPT_PLAIN;
- free (uuid);
- uuid = NULL;
- } else if (!strncmp(uuid, CRYPT_LUKS1, strlen(CRYPT_LUKS1)))
- type = CRYPT_LUKS1;
- }
+ if (!(h = malloc(sizeof(struct crypt_device))))
+ return -ENOMEM;
- if (!options->device)
- options->device = device;
+ memset(h, 0, sizeof(*h));
- r = _crypt_init(&cd, type, options, 1, 1);
- if (r)
- goto out;
+ r = device_alloc(&h->device, device);
+ if (r < 0)
+ goto bad;
- size = options->size;
- r = device_check_and_adjust(cd, device, 0, &size, &offset, &read_only);
- if (r)
- goto out;
+ dm_backend_init();
- r = dm_create_device(options->name, device, cipher, type,
- crypt_get_uuid(cd), size, skip, offset,
- key_size, key, read_only, 1);
-out:
- crypt_safe_free(key);
- free(cipher);
- if (options->device == device)
- options->device = NULL;
- free(device);
- free(uuid);
- crypt_free(cd);
- dm_exit();
+ h->iteration_time = 1000;
+ h->password_verify = 0;
+ h->tries = 3;
+ h->rng_type = crypt_random_default_key_rng();
+ *cd = h;
+ return 0;
+bad:
+ device_free(h->device);
+ free(h);
return r;
}
-/* OPTIONS: name, icb */
-int crypt_query_device(struct crypt_options *options)
+static int crypt_check_data_device_size(struct crypt_device *cd)
{
- int read_only, r;
-
- log_dbg("Query device %s.", options->name);
+ int r;
+ uint64_t size, size_min;
- if (dm_init(NULL, 1) < 0)
- return -ENOSYS;
+ /* Check data device size, require at least one sector */
+ size_min = crypt_get_data_offset(cd) << SECTOR_SHIFT ?: SECTOR_SIZE;
- r = dm_status_device(options->name);
+ r = device_size(cd->device, &size);
if (r < 0)
- goto out;
-
- r = dm_query_device(options->name, (char **)&options->device, &options->size,
- &options->skip, &options->offset, (char **)&options->cipher,
- &options->key_size, NULL, &read_only, NULL, NULL);
- if (r >= 0) {
- if (read_only)
- options->flags |= CRYPT_FLAG_READONLY;
-
- options->flags |= CRYPT_FLAG_FREE_DEVICE;
- options->flags |= CRYPT_FLAG_FREE_CIPHER;
+ return r;
- r = 1;
+ if (size < size_min) {
+ log_err(cd, _("Header detected but device %s is too small.\n"),
+ device_path(cd->device));
+ return -EINVAL;
}
-out:
- if (r == -ENODEV)
- r = 0;
- dm_exit();
return r;
}
-/* OPTIONS: name, icb */
-int crypt_remove_device(struct crypt_options *options)
+int crypt_set_data_device(struct crypt_device *cd, const char *device)
{
- struct crypt_device *cd = NULL;
+ struct device *dev = NULL;
int r;
- r = crypt_init_by_name(&cd, options->name);
- if (r == 0)
- r = crypt_deactivate(cd, options->name);
+ log_dbg("Setting ciphertext data device to %s.", device ?: "(none)");
- crypt_free(cd);
- return r;
-
-}
-
-/* OPTIONS: device, cipher, hash, align_payload, key_size (master key), key_slot
- * new_key_file, iteration_time, timeout, flags, icb */
-int crypt_luksFormat(struct crypt_options *options)
-{
- char cipherName[LUKS_CIPHERNAME_L];
- char cipherMode[LUKS_CIPHERMODE_L];
- char *password=NULL;
- unsigned int passwordLen;
- struct crypt_device *cd = NULL;
- struct crypt_params_luks1 cp = {
- .hash = options->hash,
- .data_alignment = options->align_payload
- };
- int r;
-
- r = crypt_parse_name_and_mode(options->cipher, cipherName, NULL, cipherMode);
- if(r < 0) {
- log_err(cd, _("No known cipher specification pattern detected.\n"));
- return r;
+ if (!isLUKS(cd->type) && !isVERITY(cd->type)) {
+ log_err(cd, _("This operation is not supported for this device type.\n"));
+ return -EINVAL;
}
- if ((r = _crypt_init(&cd, CRYPT_LUKS1, options, 0, 1)))
- return r;
-
- if (options->key_slot >= LUKS_NUMKEYS && options->key_slot != CRYPT_ANY_SLOT) {
- log_err(cd, _("Key slot %d is invalid, please select between 0 and %d.\n"),
- options->key_slot, LUKS_NUMKEYS - 1);
- r = -EINVAL;
- goto out;
- }
+ /* metadata device must be set */
+ if (!cd->device || !device)
+ return -EINVAL;
- r = crypt_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen, 0,
- options->new_key_file, cd->timeout, cd->password_verify, cd);
+ r = device_alloc(&dev, device);
+ if (r < 0)
+ return r;
- if(r < 0)
- goto out;
+ if (!cd->metadata_device) {
+ cd->metadata_device = cd->device;
+ } else
+ device_free(cd->device);
- r = crypt_format(cd, CRYPT_LUKS1, cipherName, cipherMode,
- NULL, NULL, options->key_size, &cp);
- if (r < 0)
- goto out;
+ cd->device = dev;
- /* Add keyslot using internally stored volume key generated during format */
- r = crypt_keyslot_add_by_volume_key(cd, options->key_slot, NULL, 0,
- password, passwordLen);
-out:
- crypt_free(cd);
- crypt_safe_free(password);
- return (r < 0) ? r : 0;
+ return crypt_check_data_device_size(cd);
}
-/* OPTIONS: name, device, key_size, key_file, timeout, tries, flags, icb */
-int crypt_luksOpen(struct crypt_options *options)
+static int _crypt_load_luks1(struct crypt_device *cd, int require_header, int repair)
{
- struct crypt_device *cd = NULL;
- uint32_t flags = 0;
+ struct luks_phdr hdr;
int r;
- if (!options->name)
- return -EINVAL;
-
- r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
- if (r)
+ r = init_crypto(cd);
+ if (r < 0)
return r;
- if (options->flags & CRYPT_FLAG_READONLY)
- flags |= CRYPT_ACTIVATE_READONLY;
+ r = LUKS_read_phdr(&hdr, require_header, repair, cd);
+ if (r < 0)
+ return r;
- if (options->flags & CRYPT_FLAG_NON_EXCLUSIVE_ACCESS)
- flags |= CRYPT_ACTIVATE_NO_UUID;
+ if (!cd->type && !(cd->type = strdup(CRYPT_LUKS1)))
+ return -ENOMEM;
- if (options->key_file)
- r = crypt_activate_by_keyfile(cd, options->name,
- CRYPT_ANY_SLOT, options->key_file, options->key_size,
- flags);
- else
- r = crypt_activate_by_passphrase(cd, options->name,
- CRYPT_ANY_SLOT, options->passphrase,
- options->passphrase ? strlen(options->passphrase) : 0,
- flags);
+ memcpy(&cd->u.luks1.hdr, &hdr, sizeof(hdr));
- crypt_free(cd);
- return (r < 0) ? r : 0;
+ return r;
}
-/* OPTIONS: device, keys_slot, key_file, timeout, flags, icb */
-int crypt_luksKillSlot(struct crypt_options *options)
+static int _crypt_load_tcrypt(struct crypt_device *cd, struct crypt_params_tcrypt *params)
{
- struct crypt_device *cd = NULL;
int r;
- r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
- if (r)
- return r;
-
- r = luks_remove_helper(cd, options->key_slot, options->key_file, NULL,
- options->flags & CRYPT_FLAG_VERIFY_ON_DELKEY);
-
- crypt_free(cd);
- return (r < 0) ? r : 0;
-}
-
-/* OPTIONS: device, new_key_file, key_file, timeout, flags, icb */
-int crypt_luksRemoveKey(struct crypt_options *options)
-{
- struct crypt_device *cd = NULL;
- int r;
+ if (!params)
+ return -EINVAL;
- r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
- if (r)
+ r = init_crypto(cd);
+ if (r < 0)
return r;
- r = luks_remove_helper(cd, CRYPT_ANY_SLOT, options->key_file, options->new_key_file,
- options->flags & CRYPT_FLAG_VERIFY_ON_DELKEY);
+ memcpy(&cd->u.tcrypt.params, params, sizeof(*params));
- crypt_free(cd);
- return (r < 0) ? r : 0;
-}
+ r = TCRYPT_read_phdr(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
+ cd->u.tcrypt.params.passphrase = NULL;
+ cd->u.tcrypt.params.passphrase_size = 0;
+ cd->u.tcrypt.params.keyfiles = NULL;
+ cd->u.tcrypt.params.keyfiles_count = 0;
-/* OPTIONS: device, new_key_file, key_file, key_slot, flags,
- iteration_time, timeout, icb */
-int crypt_luksAddKey(struct crypt_options *options)
-{
- struct crypt_device *cd = NULL;
- int r = -EINVAL;
-
- r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 1);
- if (r)
+ if (r < 0)
return r;
- if (options->key_file || options->new_key_file)
- r = crypt_keyslot_add_by_keyfile(cd, options->key_slot,
- options->key_file, 0,
- options->new_key_file, 0);
- else
- r = crypt_keyslot_add_by_passphrase(cd, options->key_slot,
- NULL, 0, NULL, 0);
+ if (!cd->type && !(cd->type = strdup(CRYPT_TCRYPT)))
+ return -ENOMEM;
- crypt_free(cd);
- return (r < 0) ? r : 0;
+ return r;
}
-/* OPTIONS: device, icb */
-int crypt_luksUUID(struct crypt_options *options)
+static int _crypt_load_verity(struct crypt_device *cd, struct crypt_params_verity *params)
{
- struct crypt_device *cd = NULL;
- char *uuid;
int r;
+ size_t sb_offset = 0;
- r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 0);
- if (r)
+ r = init_crypto(cd);
+ if (r < 0)
return r;
- uuid = (char *)crypt_get_uuid(cd);
- log_std(cd, uuid ?: "");
- log_std(cd, "\n");
- crypt_free(cd);
- return 0;
-}
-
-/* OPTIONS: device, icb */
-int crypt_isLuks(struct crypt_options *options)
-{
- struct crypt_device *cd = NULL;
- int r;
+ if (params && params->flags & CRYPT_VERITY_NO_HEADER)
+ return -EINVAL;
- log_dbg("Check device %s for LUKS header.", options->device);
+ if (params)
+ sb_offset = params->hash_area_offset;
- r = init_crypto(cd);
+ r = VERITY_read_sb(cd, sb_offset, &cd->u.verity.uuid, &cd->u.verity.hdr);
if (r < 0)
return r;
- r = crypt_init(&cd, options->device);
- if (r < 0)
- return -EINVAL;
-
- /* Do print fail here, no need to crypt_load() */
- r = LUKS_read_phdr(cd->device, &cd->hdr, 0, cd) ? -EINVAL : 0;
+ if (params)
+ cd->u.verity.hdr.flags = params->flags;
- crypt_free(cd);
- return r;
-}
+ /* Hash availability checked in sb load */
+ cd->u.verity.root_hash_size = crypt_hash_size(cd->u.verity.hdr.hash_name);
+ if (cd->u.verity.root_hash_size > 4096)
+ return -EINVAL;
-/* OPTIONS: device, icb */
-int crypt_luksDump(struct crypt_options *options)
-{
- struct crypt_device *cd = NULL;
- int r;
+ if (!cd->type && !(cd->type = strdup(CRYPT_VERITY)))
+ return -ENOMEM;
- r = _crypt_init(&cd, CRYPT_LUKS1, options, 1, 0);
- if(r < 0)
+ if (params && params->data_device &&
+ (r = crypt_set_data_device(cd, params->data_device)) < 0)
return r;
- r = crypt_dump(cd);
-
- crypt_free(cd);
return r;
}
-void crypt_get_error(char *buf, size_t size)
+static int _init_by_name_crypt(struct crypt_device *cd, const char *name)
{
- const char *error = get_error();
+ struct crypt_dm_active_device dmd = {};
+ char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
+ int key_nums, r;
- if (!buf || size < 1)
- set_error(NULL);
- else if (error) {
- strncpy(buf, error, size - 1);
- buf[size - 1] = '\0';
- set_error(NULL);
- } else
- buf[0] = '\0';
-}
+ r = dm_query_device(cd, name,
+ DM_ACTIVE_DEVICE |
+ DM_ACTIVE_UUID |
+ DM_ACTIVE_CRYPT_CIPHER |
+ DM_ACTIVE_CRYPT_KEYSIZE, &dmd);
+ if (r < 0)
+ goto out;
-void crypt_put_options(struct crypt_options *options)
-{
- if (options->flags & CRYPT_FLAG_FREE_DEVICE) {
- free((char *)options->device);
- options->device = NULL;
- options->flags &= ~CRYPT_FLAG_FREE_DEVICE;
- }
- if (options->flags & CRYPT_FLAG_FREE_CIPHER) {
- free((char *)options->cipher);
- options->cipher = NULL;
- options->flags &= ~CRYPT_FLAG_FREE_CIPHER;
+ if (isPLAIN(cd->type)) {
+ cd->u.plain.uuid = dmd.uuid ? strdup(dmd.uuid) : NULL;
+ cd->u.plain.hdr.hash = NULL; /* no way to get this */
+ cd->u.plain.hdr.offset = dmd.u.crypt.offset;
+ cd->u.plain.hdr.skip = dmd.u.crypt.iv_offset;
+ cd->u.plain.key_size = dmd.u.crypt.vk->keylength;
+
+ r = crypt_parse_name_and_mode(dmd.u.crypt.cipher, cipher, NULL, cipher_mode);
+ if (!r) {
+ cd->u.plain.cipher = strdup(cipher);
+ cd->u.plain.cipher_mode = strdup(cipher_mode);
+ }
+ } else if (isLOOPAES(cd->type)) {
+ cd->u.loopaes.uuid = dmd.uuid ? strdup(dmd.uuid) : NULL;
+ cd->u.loopaes.hdr.offset = dmd.u.crypt.offset;
+
+ r = crypt_parse_name_and_mode(dmd.u.crypt.cipher, cipher,
+ &key_nums, cipher_mode);
+ if (!r) {
+ cd->u.loopaes.cipher = strdup(cipher);
+ cd->u.loopaes.cipher_mode = strdup(cipher_mode);
+ /* version 3 uses last key for IV */
+ if (dmd.u.crypt.vk->keylength % key_nums)
+ key_nums++;
+ cd->u.loopaes.key_size = dmd.u.crypt.vk->keylength / key_nums;
+ }
+ } else if (isLUKS(cd->type)) {
+ if (crypt_metadata_device(cd)) {
+ r = _crypt_load_luks1(cd, 0, 0);
+ if (r < 0) {
+ log_dbg("LUKS device header does not match active device.");
+ free(cd->type);
+ cd->type = NULL;
+ r = 0;
+ goto out;
+ }
+ /* check whether UUIDs match each other */
+ r = crypt_uuid_cmp(dmd.uuid, cd->u.luks1.hdr.uuid);
+ if (r < 0) {
+ log_dbg("LUKS device header uuid: %s mismatches DM returned uuid %s",
+ cd->u.luks1.hdr.uuid, dmd.uuid);
+ free(cd->type);
+ cd->type = NULL;
+ r = 0;
+ goto out;
+ }
+ }
+ } else if (isTCRYPT(cd->type)) {
+ r = TCRYPT_init_by_name(cd, name, &dmd, &cd->device,
+ &cd->u.tcrypt.params, &cd->u.tcrypt.hdr);
}
+out:
+ crypt_free_volume_key(dmd.u.crypt.vk);
+ device_free(dmd.data_device);
+ free(CONST_CAST(void*)dmd.u.crypt.cipher);
+ free(CONST_CAST(void*)dmd.uuid);
+ return r;
}
-const char *crypt_get_dir(void)
+static int _init_by_name_verity(struct crypt_device *cd, const char *name)
{
- return dm_get_dir();
-}
-
-/////////////////////////////////
-//
-// New API
-//
-
-int crypt_init(struct crypt_device **cd, const char *device)
-{
- struct crypt_device *h = NULL;
-
- if (!cd)
- return -EINVAL;
-
- log_dbg("Allocating crypt device %s context.", device);
-
- if (device && !device_ready(NULL, device, O_RDONLY))
- return -ENOTBLK;
-
- if (!(h = malloc(sizeof(struct crypt_device))))
- return -ENOMEM;
-
- memset(h, 0, sizeof(*h));
+ struct crypt_params_verity params = {};
+ struct crypt_dm_active_device dmd = {
+ .target = DM_VERITY,
+ .u.verity.vp = ¶ms,
+ };
+ int r;
- if (device) {
- h->device = strdup(device);
- if (!h->device) {
- free(h);
- return -ENOMEM;
- }
- } else
- h->device = NULL;
+ r = dm_query_device(cd, name,
+ DM_ACTIVE_DEVICE |
+ DM_ACTIVE_UUID |
+ DM_ACTIVE_VERITY_HASH_DEVICE |
+ DM_ACTIVE_VERITY_PARAMS, &dmd);
+ if (r < 0)
+ goto out;
- if (dm_init(h, 1) < 0) {
- free(h);
- return -ENOSYS;
+ if (isVERITY(cd->type)) {
+ cd->u.verity.uuid = dmd.uuid ? strdup(dmd.uuid) : NULL;
+ cd->u.verity.hdr.flags = CRYPT_VERITY_NO_HEADER; //FIXME
+ cd->u.verity.hdr.data_size = params.data_size;
+ cd->u.verity.root_hash_size = dmd.u.verity.root_hash_size;
+ cd->u.verity.root_hash = NULL;
+ cd->u.verity.hdr.hash_name = params.hash_name;
+ cd->u.verity.hdr.data_device = NULL;
+ cd->u.verity.hdr.hash_device = NULL;
+ cd->u.verity.hdr.data_block_size = params.data_block_size;
+ cd->u.verity.hdr.hash_block_size = params.hash_block_size;
+ cd->u.verity.hdr.hash_area_offset = dmd.u.verity.hash_offset;
+ cd->u.verity.hdr.hash_type = params.hash_type;
+ cd->u.verity.hdr.flags = params.flags;
+ cd->u.verity.hdr.salt_size = params.salt_size;
+ cd->u.verity.hdr.salt = params.salt;
+ cd->metadata_device = dmd.u.verity.hash_device;
}
-
- h->iteration_time = 1000;
- h->password_verify = 0;
- h->tries = 3;
- h->rng_type = crypt_random_default_key_rng();
- *cd = h;
- return 0;
+out:
+ device_free(dmd.data_device);
+ free(CONST_CAST(void*)dmd.uuid);
+ return r;
}
-int crypt_init_by_name(struct crypt_device **cd, const char *name)
+int crypt_init_by_name_and_header(struct crypt_device **cd,
+ const char *name,
+ const char *header_device)
{
crypt_status_info ci;
- struct crypt_active_device cad;
- char *device = NULL, *cipher_full = NULL, *device_uuid = NULL;
- char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
- char *key = NULL;
- int key_size = 0, key_nums, r;
-
+ struct crypt_dm_active_device dmd;
+ int r;
log_dbg("Allocating crypt device context by device %s.", name);
return -ENODEV;
}
- r = dm_query_device(name, &device, &cad.size, &cad.iv_offset, &cad.offset,
- &cipher_full, &key_size, &key, NULL, NULL,
- &device_uuid);
+ r = dm_query_device(NULL, name, DM_ACTIVE_DEVICE | DM_ACTIVE_UUID, &dmd);
if (r < 0)
goto out;
*cd = NULL;
- r = crypt_init(cd, device);
- /* Underlying device disappeared but mapping still active */
- if (!device || r == -ENOTBLK)
- log_verbose(NULL, _("Underlying device for crypt device %s disappeared.\n"),
- name);
-
- /* Underlying device is not readable but crypt mapping exists */
- if (r == -ENOTBLK) {
- free(device);
- device = NULL;
- r = crypt_init(cd, NULL);
+ if (header_device) {
+ r = crypt_init(cd, header_device);
+ } else {
+ r = crypt_init(cd, device_path(dmd.data_device));
+
+ /* Underlying device disappeared but mapping still active */
+ if (!dmd.data_device || r == -ENOTBLK)
+ log_verbose(NULL, _("Underlying device for crypt device %s disappeared.\n"),
+ name);
+
+ /* Underlying device is not readable but crypt mapping exists */
+ if (r == -ENOTBLK) {
+ device_free(dmd.data_device);
+ dmd.data_device = NULL;
+ r = crypt_init(cd, NULL);
+ }
}
if (r < 0)
goto out;
- /* Try to initialise basic parameters from active device */
- if (device_uuid) {
- if (!strncmp(CRYPT_PLAIN, device_uuid, sizeof(CRYPT_PLAIN)-1)) {
+ if (dmd.uuid) {
+ if (!strncmp(CRYPT_PLAIN, dmd.uuid, sizeof(CRYPT_PLAIN)-1))
(*cd)->type = strdup(CRYPT_PLAIN);
- (*cd)->plain_uuid = strdup(device_uuid);
- (*cd)->plain_hdr.hash = NULL; /* no way to get this */
- (*cd)->plain_hdr.offset = cad.offset;
- (*cd)->plain_hdr.skip = cad.iv_offset;
- (*cd)->volume_key = crypt_alloc_volume_key(key_size, key);
- if (!(*cd)->volume_key) {
- r = -ENOMEM;
- goto out;
- }
-
- r = crypt_parse_name_and_mode(cipher_full, cipher, NULL, cipher_mode);
- if (!r) {
- (*cd)->plain_cipher = strdup(cipher);
- (*cd)->plain_cipher_mode = strdup(cipher_mode);
- }
- } else if (!strncmp(CRYPT_LOOPAES, device_uuid, sizeof(CRYPT_LOOPAES)-1)) {
+ else if (!strncmp(CRYPT_LOOPAES, dmd.uuid, sizeof(CRYPT_LOOPAES)-1))
(*cd)->type = strdup(CRYPT_LOOPAES);
- (*cd)->loopaes_uuid = strdup(device_uuid);
- (*cd)->loopaes_hdr.offset = cad.offset;
-
- r = crypt_parse_name_and_mode(cipher_full, cipher,
- &key_nums, cipher_mode);
- if (!r) {
- (*cd)->loopaes_cipher = strdup(cipher);
- (*cd)->loopaes_cipher_mode = strdup(cipher_mode);
- /* version 3 uses last key for IV */
- if (key_size % key_nums)
- key_nums++;
- (*cd)->loopaes_key_size = key_size / key_nums;
- }
- } else if (!strncmp(CRYPT_LUKS1, device_uuid, sizeof(CRYPT_LUKS1)-1)) {
- if (device) {
- if (crypt_load(*cd, CRYPT_LUKS1, NULL) < 0 ||
- crypt_volume_key_verify(*cd, key, key_size) < 0) {
- log_dbg("LUKS device header does not match active device.");
- goto out;
- }
-
- (*cd)->volume_key = crypt_alloc_volume_key(key_size, key);
- if (!(*cd)->volume_key) {
- r = -ENOMEM;
- goto out;
- }
- }
- }
+ else if (!strncmp(CRYPT_LUKS1, dmd.uuid, sizeof(CRYPT_LUKS1)-1))
+ (*cd)->type = strdup(CRYPT_LUKS1);
+ else if (!strncmp(CRYPT_VERITY, dmd.uuid, sizeof(CRYPT_VERITY)-1))
+ (*cd)->type = strdup(CRYPT_VERITY);
+ else if (!strncmp(CRYPT_TCRYPT, dmd.uuid, sizeof(CRYPT_TCRYPT)-1))
+ (*cd)->type = strdup(CRYPT_TCRYPT);
+ else
+ log_dbg("Unknown UUID set, some parameters are not set.");
} else
log_dbg("Active device has no UUID set, some parameters are not set.");
+ if (header_device) {
+ r = crypt_set_data_device(*cd, device_path(dmd.data_device));
+ if (r < 0)
+ goto out;
+ }
+
+ /* Try to initialise basic parameters from active device */
+
+ if (dmd.target == DM_CRYPT)
+ r = _init_by_name_crypt(*cd, name);
+ else if (dmd.target == DM_VERITY)
+ r = _init_by_name_verity(*cd, name);
out:
if (r < 0) {
crypt_free(*cd);
*cd = NULL;
}
- crypt_safe_free(key);
- free(device);
- free(cipher_full);
- free(device_uuid);
+ device_free(dmd.data_device);
+ free(CONST_CAST(void*)dmd.uuid);
return r;
}
+int crypt_init_by_name(struct crypt_device **cd, const char *name)
+{
+ return crypt_init_by_name_and_header(cd, name, NULL);
+}
+
static int _crypt_format_plain(struct crypt_device *cd,
const char *cipher,
const char *cipher_mode,
return -EINVAL;
}
+ if (!(cd->type = strdup(CRYPT_PLAIN)))
+ return -ENOMEM;
+
+ cd->u.plain.key_size = volume_key_size;
cd->volume_key = crypt_alloc_volume_key(volume_key_size, NULL);
if (!cd->volume_key)
return -ENOMEM;
- cd->plain_cipher = strdup(cipher);
- cd->plain_cipher_mode = strdup(cipher_mode);
+ cd->u.plain.cipher = strdup(cipher);
+ cd->u.plain.cipher_mode = strdup(cipher_mode);
if (uuid)
- cd->plain_uuid = strdup(uuid);
+ cd->u.plain.uuid = strdup(uuid);
if (params && params->hash)
- cd->plain_hdr.hash = strdup(params->hash);
+ cd->u.plain.hdr.hash = strdup(params->hash);
- cd->plain_hdr.offset = params ? params->offset : 0;
- cd->plain_hdr.skip = params ? params->skip : 0;
+ cd->u.plain.hdr.offset = params ? params->offset : 0;
+ cd->u.plain.hdr.skip = params ? params->skip : 0;
+ cd->u.plain.hdr.size = params ? params->size : 0;
- if (!cd->plain_cipher || !cd->plain_cipher_mode)
+ if (!cd->u.plain.cipher || !cd->u.plain.cipher_mode)
return -ENOMEM;
return 0;
unsigned long required_alignment = DEFAULT_DISK_ALIGNMENT;
unsigned long alignment_offset = 0;
- if (!cd->device) {
+ if (!crypt_metadata_device(cd)) {
log_err(cd, _("Can't format LUKS without device.\n"));
return -EINVAL;
}
+ if (!(cd->type = strdup(CRYPT_LUKS1)))
+ return -ENOMEM;
+
if (volume_key)
cd->volume_key = crypt_alloc_volume_key(volume_key_size,
volume_key);
if(!cd->volume_key)
return -ENOMEM;
- if (params && params->data_alignment)
+ if (params && params->data_device) {
+ cd->metadata_device = cd->device;
+ cd->device = NULL;
+ if (device_alloc(&cd->device, params->data_device) < 0)
+ return -ENOMEM;
required_alignment = params->data_alignment * SECTOR_SIZE;
- else
- get_topology_alignment(cd->device, &required_alignment,
+ } else if (params && params->data_alignment) {
+ required_alignment = params->data_alignment * SECTOR_SIZE;
+ } else
+ device_topology_alignment(cd->device,
+ &required_alignment,
&alignment_offset, DEFAULT_DISK_ALIGNMENT);
- r = LUKS_generate_phdr(&cd->hdr, cd->volume_key, cipher, cipher_mode,
+ /* Check early if we cannot allocate block device for key slot access */
+ r = device_block_adjust(cd, cd->device, DEV_OK, 0, NULL, NULL);
+ if(r < 0)
+ return r;
+
+ r = LUKS_generate_phdr(&cd->u.luks1.hdr, cd->volume_key, cipher, cipher_mode,
(params && params->hash) ? params->hash : "sha1",
uuid, LUKS_STRIPES,
required_alignment / SECTOR_SIZE,
alignment_offset / SECTOR_SIZE,
- cd->iteration_time, &cd->PBKDF2_per_sec, cd);
+ cd->iteration_time, &cd->u.luks1.PBKDF2_per_sec,
+ cd->metadata_device ? 1 : 0, cd);
if(r < 0)
return r;
/* Wipe first 8 sectors - fs magic numbers etc. */
- r = wipe_device_header(cd->device, 8);
+ r = crypt_wipe(crypt_metadata_device(cd), 0, 8 * SECTOR_SIZE, CRYPT_WIPE_ZERO, 1);
if(r < 0) {
if (r == -EBUSY)
log_err(cd, _("Cannot format device %s which is still in use.\n"),
- cd->device);
- else
+ mdata_device_path(cd));
+ else if (r == -EACCES) {
+ log_err(cd, _("Cannot format device %s, permission denied.\n"),
+ mdata_device_path(cd));
+ r = -EINVAL;
+ } else
log_err(cd, _("Cannot wipe header on device %s.\n"),
- cd->device);
+ mdata_device_path(cd));
return r;
}
- r = LUKS_write_phdr(cd->device, &cd->hdr, cd);
+ r = LUKS_write_phdr(&cd->u.luks1.hdr, cd);
return r;
}
size_t volume_key_size,
struct crypt_params_loopaes *params)
{
- if (!cd->device) {
+ if (!crypt_metadata_device(cd)) {
log_err(cd, _("Can't format LOOPAES without device.\n"));
return -EINVAL;
}
return -EINVAL;
}
- cd->loopaes_key_size = volume_key_size;
+ if (!(cd->type = strdup(CRYPT_LOOPAES)))
+ return -ENOMEM;
- cd->loopaes_cipher = strdup(cipher ?: DEFAULT_LOOPAES_CIPHER);
+ cd->u.loopaes.key_size = volume_key_size;
+
+ cd->u.loopaes.cipher = strdup(cipher ?: DEFAULT_LOOPAES_CIPHER);
if (uuid)
- cd->loopaes_uuid = strdup(uuid);
+ cd->u.loopaes.uuid = strdup(uuid);
if (params && params->hash)
- cd->loopaes_hdr.hash = strdup(params->hash);
+ cd->u.loopaes.hdr.hash = strdup(params->hash);
- cd->loopaes_hdr.offset = params ? params->offset : 0;
+ cd->u.loopaes.hdr.offset = params ? params->offset : 0;
+ cd->u.loopaes.hdr.skip = params ? params->skip : 0;
return 0;
}
+static int _crypt_format_verity(struct crypt_device *cd,
+ const char *uuid,
+ struct crypt_params_verity *params)
+{
+ int r = 0, hash_size;
+ uint64_t data_device_size;
+
+ if (!crypt_metadata_device(cd)) {
+ log_err(cd, _("Can't format VERITY without device.\n"));
+ return -EINVAL;
+ }
+
+ if (!params || !params->data_device)
+ return -EINVAL;
+
+ if (params->hash_type > VERITY_MAX_HASH_TYPE) {
+ log_err(cd, _("Unsupported VERITY hash type %d.\n"), params->hash_type);
+ return -EINVAL;
+ }
+
+ if (VERITY_BLOCK_SIZE_OK(params->data_block_size) ||
+ VERITY_BLOCK_SIZE_OK(params->hash_block_size)) {
+ log_err(cd, _("Unsupported VERITY block size.\n"));
+ return -EINVAL;
+ }
+
+ if (params->hash_area_offset % 512) {
+ log_err(cd, _("Unsupported VERITY hash offset.\n"));
+ return -EINVAL;
+ }
+
+ if (!(cd->type = strdup(CRYPT_VERITY)))
+ return -ENOMEM;
+
+ r = crypt_set_data_device(cd, params->data_device);
+ if (r)
+ return r;
+ if (!params->data_size) {
+ r = device_size(cd->device, &data_device_size);
+ if (r < 0)
+ return r;
+
+ cd->u.verity.hdr.data_size = data_device_size / params->data_block_size;
+ } else
+ cd->u.verity.hdr.data_size = params->data_size;
+
+ hash_size = crypt_hash_size(params->hash_name);
+ if (hash_size <= 0) {
+ log_err(cd, _("Hash algorithm %s not supported.\n"),
+ params->hash_name);
+ return -EINVAL;
+ }
+ cd->u.verity.root_hash_size = hash_size;
+
+ cd->u.verity.root_hash = malloc(cd->u.verity.root_hash_size);
+ if (!cd->u.verity.root_hash)
+ return -ENOMEM;
+
+ cd->u.verity.hdr.flags = params->flags;
+ if (!(cd->u.verity.hdr.hash_name = strdup(params->hash_name)))
+ return -ENOMEM;
+ cd->u.verity.hdr.data_device = NULL;
+ cd->u.verity.hdr.data_block_size = params->data_block_size;
+ cd->u.verity.hdr.hash_block_size = params->hash_block_size;
+ cd->u.verity.hdr.hash_area_offset = params->hash_area_offset;
+ cd->u.verity.hdr.hash_type = params->hash_type;
+ cd->u.verity.hdr.flags = params->flags;
+ cd->u.verity.hdr.salt_size = params->salt_size;
+ if (!(cd->u.verity.hdr.salt = malloc(params->salt_size)))
+ return -ENOMEM;
+
+ if (params->salt)
+ memcpy(CONST_CAST(char*)cd->u.verity.hdr.salt, params->salt,
+ params->salt_size);
+ else
+ r = crypt_random_get(cd, CONST_CAST(char*)cd->u.verity.hdr.salt,
+ params->salt_size, CRYPT_RND_SALT);
+ if (r)
+ return r;
+
+ if (params->flags & CRYPT_VERITY_CREATE_HASH) {
+ r = VERITY_create(cd, &cd->u.verity.hdr,
+ cd->u.verity.root_hash, cd->u.verity.root_hash_size);
+ if (r)
+ return r;
+ }
+
+ if (!(params->flags & CRYPT_VERITY_NO_HEADER)) {
+ if (uuid)
+ cd->u.verity.uuid = strdup(uuid);
+ else {
+ r = VERITY_UUID_generate(cd, &cd->u.verity.uuid);
+ if (r)
+ return r;
+ }
+
+ r = VERITY_write_sb(cd, cd->u.verity.hdr.hash_area_offset,
+ cd->u.verity.uuid,
+ &cd->u.verity.hdr);
+ }
+ return r;
+}
+
int crypt_format(struct crypt_device *cd,
const char *type,
const char *cipher,
if (!type)
return -EINVAL;
- log_dbg("Formatting device %s as type %s.", cd->device ?: "(none)", type);
+ if (cd->type) {
+ log_dbg("Context already formatted as %s.", cd->type);
+ return -EINVAL;
+ }
+
+ log_dbg("Formatting device %s as type %s.", mdata_device_path(cd) ?: "(none)", type);
r = init_crypto(cd);
if (r < 0)
uuid, volume_key, volume_key_size, params);
else if (isLOOPAES(type))
r = _crypt_format_loopaes(cd, cipher, uuid, volume_key_size, params);
+ else if (isVERITY(type))
+ r = _crypt_format_verity(cd, uuid, params);
else {
- /* FIXME: allow plugins here? */
log_err(cd, _("Unknown crypt device type %s requested.\n"), type);
r = -EINVAL;
}
- if (!r && !(cd->type = strdup(type)))
- r = -ENOMEM;
-
if (r < 0) {
+ free(cd->type);
+ cd->type = NULL;
crypt_free_volume_key(cd->volume_key);
cd->volume_key = NULL;
}
return r;
}
-int crypt_load(struct crypt_device *cd,
- const char *requested_type,
- void *params)
+int crypt_load(struct crypt_device *cd,
+ const char *requested_type,
+ void *params)
+{
+ int r;
+
+ log_dbg("Trying to load %s crypt type from device %s.",
+ requested_type ?: "any", mdata_device_path(cd) ?: "(none)");
+
+ if (!crypt_metadata_device(cd))
+ return -EINVAL;
+
+ if (!requested_type || isLUKS(requested_type)) {
+ if (cd->type && !isLUKS(cd->type)) {
+ log_dbg("Context is already initialised to type %s", cd->type);
+ return -EINVAL;
+ }
+
+ r = _crypt_load_luks1(cd, 1, 0);
+ } else if (isVERITY(requested_type)) {
+ if (cd->type && !isVERITY(cd->type)) {
+ log_dbg("Context is already initialised to type %s", cd->type);
+ return -EINVAL;
+ }
+ r = _crypt_load_verity(cd, params);
+ } else if (isTCRYPT(requested_type)) {
+ if (cd->type && !isTCRYPT(cd->type)) {
+ log_dbg("Context is already initialised to type %s", cd->type);
+ return -EINVAL;
+ }
+ r = _crypt_load_tcrypt(cd, params);
+ } else
+ return -EINVAL;
+
+ return r;
+}
+
+int crypt_repair(struct crypt_device *cd,
+ const char *requested_type,
+ void *params __attribute__((unused)))
{
- struct luks_phdr hdr;
int r;
- log_dbg("Trying to load %s crypt type from device %s.",
- requested_type ?: "any", cd->device ?: "(none)");
+ log_dbg("Trying to repair %s crypt type from device %s.",
+ requested_type ?: "any", mdata_device_path(cd) ?: "(none)");
- if (!cd->device)
+ if (!crypt_metadata_device(cd))
return -EINVAL;
if (requested_type && !isLUKS(requested_type))
return -EINVAL;
- r = init_crypto(cd);
+
+ /* Load with repair */
+ r = _crypt_load_luks1(cd, 1, 1);
if (r < 0)
return r;
- r = LUKS_read_phdr(cd->device, &hdr, 1, cd);
-
- if (!r) {
- memcpy(&cd->hdr, &hdr, sizeof(hdr));
- cd->type = strdup(CRYPT_LUKS1);
- if (!cd->type)
- r = -ENOMEM;
+ /* cd->type and header must be set in context */
+ r = crypt_check_data_device_size(cd);
+ if (r < 0) {
+ free(cd->type);
+ cd->type = NULL;
}
return r;
int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size)
{
- char *device = NULL, *cipher = NULL, *uuid = NULL, *key = NULL;
- uint64_t size, skip, offset;
- int key_size, read_only, r;
+ struct crypt_dm_active_device dmd;
+ int r;
/* Device context type must be initialised */
if (!cd->type || !crypt_get_uuid(cd))
return -EINVAL;
- r = dm_query_device(name, &device, &size, &skip, &offset,
- &cipher, &key_size, &key, &read_only, NULL, &uuid);
+ log_dbg("Resizing device %s to %" PRIu64 " sectors.", name, new_size);
+
+ r = dm_query_device(cd, name, DM_ACTIVE_DEVICE | DM_ACTIVE_CRYPT_CIPHER |
+ DM_ACTIVE_UUID | DM_ACTIVE_CRYPT_KEYSIZE |
+ DM_ACTIVE_CRYPT_KEY, &dmd);
if (r < 0) {
log_err(NULL, _("Device %s is not active.\n"), name);
- goto out;
+ return -EINVAL;
}
- if (!uuid) {
+ if (!dmd.uuid || dmd.target != DM_CRYPT) {
r = -EINVAL;
goto out;
}
- r = device_check_and_adjust(cd, device, 0, &new_size, &offset, &read_only);
+ r = device_block_adjust(cd, dmd.data_device, DEV_OK,
+ dmd.u.crypt.offset, &new_size, &dmd.flags);
if (r)
goto out;
- if (new_size == size) {
+ if (new_size == dmd.size) {
log_dbg("Device has already requested size %" PRIu64
- " sectors.", size);
+ " sectors.", dmd.size);
r = 0;
- goto out;
+ } else {
+ dmd.size = new_size;
+ if (isTCRYPT(cd->type))
+ r = -ENOTSUP;
+ else
+ r = dm_create_device(cd, name, cd->type, &dmd, 1);
}
-
- log_dbg("Resizing device %s to %" PRIu64 " sectors.", name, new_size);
-
- r = dm_create_device(name, device, cipher, cd->type,
- crypt_get_uuid(cd), new_size, skip, offset,
- key_size, key, read_only, 1);
out:
- crypt_safe_free(key);
- free(cipher);
- free(device);
- free(uuid);
+ if (dmd.target == DM_CRYPT) {
+ crypt_free_volume_key(dmd.u.crypt.vk);
+ free(CONST_CAST(void*)dmd.u.crypt.cipher);
+ }
+ free(CONST_CAST(void*)dmd.data_device);
+ free(CONST_CAST(void*)dmd.uuid);
return r;
}
return -EINVAL;
}
- if (uuid && !strncmp(uuid, cd->hdr.uuid, sizeof(cd->hdr.uuid))) {
+ if (uuid && !strncmp(uuid, cd->u.luks1.hdr.uuid, sizeof(cd->u.luks1.hdr.uuid))) {
log_dbg("UUID is the same as requested (%s) for device %s.",
- uuid, cd->device);
+ uuid, mdata_device_path(cd));
return 0;
}
if (uuid)
- log_dbg("Requested new UUID change to %s for %s.", uuid, cd->device);
+ log_dbg("Requested new UUID change to %s for %s.", uuid, mdata_device_path(cd));
else
- log_dbg("Requested new UUID refresh for %s.", cd->device);
+ log_dbg("Requested new UUID refresh for %s.", mdata_device_path(cd));
if (!crypt_confirm(cd, _("Do you really want to change UUID of device?")))
return -EPERM;
- return LUKS_hdr_uuid_set(cd->device, &cd->hdr, uuid, cd);
+ return LUKS_hdr_uuid_set(&cd->u.luks1.hdr, uuid, cd);
}
int crypt_header_backup(struct crypt_device *cd,
return r;
log_dbg("Requested header backup of device %s (%s) to "
- "file %s.", cd->device, requested_type, backup_file);
+ "file %s.", mdata_device_path(cd), requested_type, backup_file);
- return LUKS_hdr_backup(backup_file, cd->device, &cd->hdr, cd);
+ return LUKS_hdr_backup(backup_file, &cd->u.luks1.hdr, cd);
}
int crypt_header_restore(struct crypt_device *cd,
if (requested_type && !isLUKS(requested_type))
return -EINVAL;
- /* Some hash functions need initialized gcrypt library */
+ if (cd->type && !isLUKS(cd->type))
+ return -EINVAL;
+
r = init_crypto(cd);
if (r < 0)
return r;
log_dbg("Requested header restore to device %s (%s) from "
- "file %s.", cd->device, requested_type, backup_file);
+ "file %s.", mdata_device_path(cd), requested_type, backup_file);
- return LUKS_hdr_restore(backup_file, cd->device, &cd->hdr, cd);
+ return LUKS_hdr_restore(backup_file, &cd->u.luks1.hdr, cd);
}
void crypt_free(struct crypt_device *cd)
{
if (cd) {
- log_dbg("Releasing crypt device %s context.", cd->device);
+ log_dbg("Releasing crypt device %s context.", mdata_device_path(cd));
- dm_exit();
+ dm_backend_exit();
crypt_free_volume_key(cd->volume_key);
- free(cd->device);
- free(cd->type);
-
- /* used in plain device only */
- free((char*)cd->plain_hdr.hash);
- free(cd->plain_cipher);
- free(cd->plain_cipher_mode);
- free(cd->plain_uuid);
+ device_free(cd->device);
+ device_free(cd->metadata_device);
+
+ if (isPLAIN(cd->type)) {
+ free(CONST_CAST(void*)cd->u.plain.hdr.hash);
+ free(cd->u.plain.cipher);
+ free(cd->u.plain.cipher_mode);
+ free(cd->u.plain.uuid);
+ } else if (isLOOPAES(cd->type)) {
+ free(CONST_CAST(void*)cd->u.loopaes.hdr.hash);
+ free(cd->u.loopaes.cipher);
+ free(cd->u.loopaes.uuid);
+ } else if (isVERITY(cd->type)) {
+ free(CONST_CAST(void*)cd->u.verity.hdr.hash_name);
+ free(CONST_CAST(void*)cd->u.verity.hdr.salt);
+ free(cd->u.verity.root_hash);
+ free(cd->u.verity.uuid);
+ }
+ free(cd->type);
+ /* Some structures can contain keys (TCRYPT), wipe it */
+ memset(cd, 0, sizeof(*cd));
free(cd);
}
}
const char *name)
{
crypt_status_info ci;
- int r, suspended = 0;
+ int r;
log_dbg("Suspending volume %s.", name);
+ if (!cd || !isLUKS(cd->type)) {
+ log_err(cd, _("This operation is supported only for LUKS device.\n"));
+ r = -EINVAL;
+ goto out;
+ }
+
ci = crypt_status(NULL, name);
if (ci < CRYPT_ACTIVE) {
log_err(cd, _("Volume %s is not active.\n"), name);
return -EINVAL;
}
- if (!cd && dm_init(NULL, 1) < 0)
- return -ENOSYS;
+ dm_backend_init();
- r = dm_query_device(name, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, &suspended, NULL);
+ r = dm_status_suspended(cd, name);
if (r < 0)
goto out;
- if (suspended) {
+ if (r) {
log_err(cd, _("Volume %s is already suspended.\n"), name);
r = -EINVAL;
goto out;
}
- r = dm_suspend_and_wipe_key(name);
+ r = dm_suspend_and_wipe_key(cd, name);
if (r == -ENOTSUP)
log_err(cd, "Suspend is not supported for device %s.\n", name);
else if (r)
log_err(cd, "Error during suspending device %s.\n", name);
out:
- if (!cd)
- dm_exit();
+ dm_backend_exit();
return r;
}
size_t passphrase_size)
{
struct volume_key *vk = NULL;
- int r, suspended = 0;
+ int r;
log_dbg("Resuming volume %s.", name);
goto out;
}
- r = dm_query_device(name, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, &suspended, NULL);
+ r = dm_status_suspended(cd, name);
if (r < 0)
return r;
- if (!suspended) {
+ if (!r) {
log_err(cd, _("Volume %s is not suspended.\n"), name);
return -EINVAL;
}
if (passphrase) {
- r = LUKS_open_key_with_hdr(cd->device, keyslot, passphrase,
- passphrase_size, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(keyslot, passphrase, passphrase_size,
+ &cd->u.luks1.hdr, &vk, cd);
} else
r = volume_key_by_terminal_passphrase(cd, keyslot, &vk);
if (r >= 0) {
keyslot = r;
- r = dm_resume_and_reinstate_key(name, vk->keylength, vk->key);
+ r = dm_resume_and_reinstate_key(cd, name, vk->keylength, vk->key);
if (r == -ENOTSUP)
log_err(cd, "Resume is not supported for device %s.\n", name);
else if (r)
return r < 0 ? r : keyslot;
}
-int crypt_resume_by_keyfile(struct crypt_device *cd,
- const char *name,
- int keyslot,
- const char *keyfile,
- size_t keyfile_size)
+int crypt_resume_by_keyfile_offset(struct crypt_device *cd,
+ const char *name,
+ int keyslot,
+ const char *keyfile,
+ size_t keyfile_size,
+ size_t keyfile_offset)
{
struct volume_key *vk = NULL;
char *passphrase_read = NULL;
- unsigned int passphrase_size_read;
- int r, suspended = 0;
+ size_t passphrase_size_read;
+ int r;
log_dbg("Resuming volume %s.", name);
goto out;
}
- r = dm_query_device(name, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, &suspended, NULL);
+ r = dm_status_suspended(cd, name);
if (r < 0)
return r;
- if (!suspended) {
+ if (!r) {
log_err(cd, _("Volume %s is not suspended.\n"), name);
return -EINVAL;
}
return -EINVAL;
r = key_from_file(cd, _("Enter passphrase: "), &passphrase_read,
- &passphrase_size_read, keyfile, keyfile_size);
+ &passphrase_size_read, keyfile, keyfile_offset,
+ keyfile_size);
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(cd->device, keyslot, passphrase_read,
- passphrase_size_read, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
+ passphrase_size_read, &cd->u.luks1.hdr, &vk, cd);
if (r < 0)
goto out;
keyslot = r;
- r = dm_resume_and_reinstate_key(name, vk->keylength, vk->key);
+ r = dm_resume_and_reinstate_key(cd, name, vk->keylength, vk->key);
if (r)
log_err(cd, "Error during resuming device %s.\n", name);
out:
return r < 0 ? r : keyslot;
}
+int crypt_resume_by_keyfile(struct crypt_device *cd,
+ const char *name,
+ int keyslot,
+ const char *keyfile,
+ size_t keyfile_size)
+{
+ return crypt_resume_by_keyfile_offset(cd, name, keyslot,
+ keyfile, keyfile_size, 0);
+}
+
// slot manipulation
int crypt_keyslot_add_by_passphrase(struct crypt_device *cd,
int keyslot, // -1 any
{
struct volume_key *vk = NULL;
char *password = NULL, *new_password = NULL;
- unsigned int passwordLen, new_passwordLen;
+ size_t passwordLen, new_passwordLen;
int r;
log_dbg("Adding new keyslot, existing passphrase %sprovided,"
if (r)
return r;
- if (!LUKS_keyslot_active_count(&cd->hdr)) {
+ if (!LUKS_keyslot_active_count(&cd->u.luks1.hdr)) {
/* No slots used, try to use pre-generated key in header */
if (cd->volume_key) {
vk = crypt_alloc_volume_key(cd->volume_key->keylength, cd->volume_key->key);
}
} else if (passphrase) {
/* Passphrase provided, use it to unlock existing keyslot */
- r = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT, passphrase,
- passphrase_size, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, passphrase,
+ passphrase_size, &cd->u.luks1.hdr, &vk, cd);
} else {
/* Passphrase not provided, ask first and use it to unlock existing keyslot */
r = key_from_terminal(cd, _("Enter any passphrase: "),
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT, password,
- passwordLen, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, password,
+ passwordLen, &cd->u.luks1.hdr, &vk, cd);
crypt_safe_free(password);
}
goto out;
if (new_passphrase) {
- new_password = (char *)new_passphrase;
+ new_password = CONST_CAST(char*)new_passphrase;
new_passwordLen = new_passphrase_size;
} else {
r = key_from_terminal(cd, _("Enter new passphrase for key slot: "),
goto out;
}
- r = LUKS_set_key(cd->device, keyslot, new_password, new_passwordLen,
- &cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
+ r = LUKS_set_key(keyslot, new_password, new_passwordLen,
+ &cd->u.luks1.hdr, vk, cd->iteration_time, &cd->u.luks1.PBKDF2_per_sec, cd);
if(r < 0) goto out;
r = 0;
return r ?: keyslot;
}
-int crypt_keyslot_add_by_keyfile(struct crypt_device *cd,
+int crypt_keyslot_change_by_passphrase(struct crypt_device *cd,
+ int keyslot_old,
+ int keyslot_new,
+ const char *passphrase,
+ size_t passphrase_size,
+ const char *new_passphrase,
+ size_t new_passphrase_size)
+{
+ struct volume_key *vk = NULL;
+ int r = -EINVAL;
+
+ log_dbg("Changing passphrase from old keyslot %d to new %d.",
+ keyslot_old, keyslot_new);
+
+ if (!isLUKS(cd->type)) {
+ log_err(cd, _("This operation is supported only for LUKS device.\n"));
+ return -EINVAL;
+ }
+
+ r = LUKS_open_key_with_hdr(keyslot_old, passphrase, passphrase_size,
+ &cd->u.luks1.hdr, &vk, cd);
+ if (r < 0)
+ goto out;
+
+ if (keyslot_old != CRYPT_ANY_SLOT && keyslot_old != r) {
+ log_dbg("Keyslot mismatch.");
+ goto out;
+ }
+ keyslot_old = r;
+
+ if (keyslot_new == CRYPT_ANY_SLOT) {
+ keyslot_new = LUKS_keyslot_find_empty(&cd->u.luks1.hdr);
+ if (keyslot_new < 0)
+ keyslot_new = keyslot_old;
+ }
+
+ if (keyslot_old == keyslot_new) {
+ log_dbg("Key slot %d is going to be overwritten.", keyslot_old);
+ (void)crypt_keyslot_destroy(cd, keyslot_old);
+ }
+
+ r = LUKS_set_key(keyslot_new, new_passphrase, new_passphrase_size,
+ &cd->u.luks1.hdr, vk, cd->iteration_time,
+ &cd->u.luks1.PBKDF2_per_sec, cd);
+
+ if (keyslot_old == keyslot_new) {
+ if (r >= 0)
+ log_verbose(cd, _("Key slot %d changed.\n"), r);
+ } else {
+ if (r >= 0) {
+ log_verbose(cd, _("Replaced with key slot %d.\n"), r);
+ r = crypt_keyslot_destroy(cd, keyslot_old);
+ }
+ }
+ if (r < 0)
+ log_err(cd, _("Failed to swap new key slot.\n"));
+out:
+ crypt_free_volume_key(vk);
+ return r ?: keyslot_new;
+}
+
+int crypt_keyslot_add_by_keyfile_offset(struct crypt_device *cd,
int keyslot,
const char *keyfile,
size_t keyfile_size,
+ size_t keyfile_offset,
const char *new_keyfile,
- size_t new_keyfile_size)
+ size_t new_keyfile_size,
+ size_t new_keyfile_offset)
{
struct volume_key *vk = NULL;
- char *password = NULL; unsigned int passwordLen;
- char *new_password = NULL; unsigned int new_passwordLen;
+ char *password = NULL; size_t passwordLen;
+ char *new_password = NULL; size_t new_passwordLen;
int r;
log_dbg("Adding new keyslot, existing keyfile %s, new keyfile %s.",
if (r)
return r;
- if (!LUKS_keyslot_active_count(&cd->hdr)) {
+ if (!LUKS_keyslot_active_count(&cd->u.luks1.hdr)) {
/* No slots used, try to use pre-generated key in header */
if (cd->volume_key) {
vk = crypt_alloc_volume_key(cd->volume_key->keylength, cd->volume_key->key);
if (keyfile)
r = key_from_file(cd, _("Enter any passphrase: "),
&password, &passwordLen,
- keyfile, keyfile_size);
+ keyfile, keyfile_offset, keyfile_size);
else
r = key_from_terminal(cd, _("Enter any passphrase: "),
&password, &passwordLen, 0);
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(cd->device, CRYPT_ANY_SLOT, password, passwordLen,
- &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, password, passwordLen,
+ &cd->u.luks1.hdr, &vk, cd);
}
if(r < 0)
if (new_keyfile)
r = key_from_file(cd, _("Enter new passphrase for key slot: "),
&new_password, &new_passwordLen, new_keyfile,
- new_keyfile_size);
+ new_keyfile_offset, new_keyfile_size);
else
r = key_from_terminal(cd, _("Enter new passphrase for key slot: "),
&new_password, &new_passwordLen, 1);
if (r < 0)
goto out;
- r = LUKS_set_key(cd->device, keyslot, new_password, new_passwordLen,
- &cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
+ r = LUKS_set_key(keyslot, new_password, new_passwordLen,
+ &cd->u.luks1.hdr, vk, cd->iteration_time, &cd->u.luks1.PBKDF2_per_sec, cd);
out:
crypt_safe_free(password);
crypt_safe_free(new_password);
return r < 0 ? r : keyslot;
}
+int crypt_keyslot_add_by_keyfile(struct crypt_device *cd,
+ int keyslot,
+ const char *keyfile,
+ size_t keyfile_size,
+ const char *new_keyfile,
+ size_t new_keyfile_size)
+{
+ return crypt_keyslot_add_by_keyfile_offset(cd, keyslot,
+ keyfile, keyfile_size, 0,
+ new_keyfile, new_keyfile_size, 0);
+}
+
int crypt_keyslot_add_by_volume_key(struct crypt_device *cd,
int keyslot,
const char *volume_key,
{
struct volume_key *vk = NULL;
int r = -EINVAL;
- char *new_password = NULL; unsigned int new_passwordLen;
+ char *new_password = NULL; size_t new_passwordLen;
log_dbg("Adding new keyslot %d using volume key.", keyslot);
if (!vk)
return -ENOMEM;
- r = LUKS_verify_volume_key(&cd->hdr, vk);
+ r = LUKS_verify_volume_key(&cd->u.luks1.hdr, vk);
if (r < 0) {
log_err(cd, _("Volume key does not match the volume.\n"));
goto out;
passphrase_size = new_passwordLen;
}
- r = LUKS_set_key(cd->device, keyslot, passphrase, passphrase_size,
- &cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
+ r = LUKS_set_key(keyslot, passphrase, passphrase_size,
+ &cd->u.luks1.hdr, vk, cd->iteration_time, &cd->u.luks1.PBKDF2_per_sec, cd);
out:
crypt_safe_free(new_password);
crypt_free_volume_key(vk);
return -EINVAL;
}
- return LUKS_del_key(cd->device, keyslot, &cd->hdr, cd);
+ return LUKS_del_key(keyslot, &cd->u.luks1.hdr, cd);
}
// activation/deactivation of device mapping
crypt_status_info ci;
struct volume_key *vk = NULL;
char *read_passphrase = NULL;
- unsigned int passphraseLen = 0;
+ size_t passphraseLen = 0;
int r;
log_dbg("%s volume %s [keyslot %d] using %spassphrase.",
/* plain, use hashed passphrase */
if (isPLAIN(cd->type)) {
+ if (!name)
+ return -EINVAL;
+
if (!passphrase) {
r = key_from_terminal(cd, NULL, &read_passphrase,
&passphraseLen, 0);
passphrase = read_passphrase;
passphrase_size = passphraseLen;
}
- r = create_device_helper(cd, name, cd->plain_hdr.hash,
- cd->plain_cipher, cd->plain_cipher_mode,
- NULL, passphrase, passphrase_size,
- cd->volume_key->keylength, 0,
- cd->plain_hdr.skip, cd->plain_hdr.offset,
- cd->plain_uuid,
- flags & CRYPT_ACTIVATE_READONLY, 0, 0);
+
+ r = process_key(cd, cd->u.plain.hdr.hash,
+ cd->u.plain.key_size,
+ passphrase, passphrase_size, &vk);
+ if (r < 0)
+ goto out;
+
+ r = PLAIN_activate(cd, name, vk, cd->u.plain.hdr.size, flags);
keyslot = 0;
} else if (isLUKS(cd->type)) {
/* provided passphrase, do not retry */
if (passphrase) {
- r = LUKS_open_key_with_hdr(cd->device, keyslot, passphrase,
- passphrase_size, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(keyslot, passphrase,
+ passphrase_size, &cd->u.luks1.hdr, &vk, cd);
} else
r = volume_key_by_terminal_passphrase(cd, keyslot, &vk);
if (r >= 0) {
keyslot = r;
if (name)
- r = open_from_hdr_and_vk(cd, vk, name, flags);
+ r = LUKS1_activate(cd, name, vk, flags);
}
} else
r = -EINVAL;
return r < 0 ? r : keyslot;
}
-int crypt_activate_by_keyfile(struct crypt_device *cd,
+int crypt_activate_by_keyfile_offset(struct crypt_device *cd,
const char *name,
int keyslot,
const char *keyfile,
size_t keyfile_size,
+ size_t keyfile_offset,
uint32_t flags)
{
crypt_status_info ci;
struct volume_key *vk = NULL;
char *passphrase_read = NULL;
- unsigned int passphrase_size_read, key_count = 0;
+ size_t passphrase_size_read;
+ unsigned int key_count = 0;
int r;
log_dbg("Activating volume %s [keyslot %d] using keyfile %s.",
return -EINVAL;
if (isPLAIN(cd->type)) {
- r = key_from_file(cd, _("Enter passphrase: "), &passphrase_read,
- &passphrase_size_read, keyfile, keyfile_size);
+ if (!name)
+ return -EINVAL;
+
+ r = key_from_file(cd, _("Enter passphrase: "),
+ &passphrase_read, &passphrase_size_read,
+ keyfile, keyfile_offset, keyfile_size);
+ if (r < 0)
+ goto out;
+
+ r = process_key(cd, cd->u.plain.hdr.hash,
+ cd->u.plain.key_size,
+ passphrase_read, passphrase_size_read, &vk);
if (r < 0)
goto out;
- r = create_device_helper(cd, name, cd->plain_hdr.hash,
- cd->plain_cipher, cd->plain_cipher_mode,
- NULL, passphrase_read, passphrase_size_read,
- cd->volume_key->keylength, 0,
- cd->plain_hdr.skip, cd->plain_hdr.offset,
- cd->plain_uuid,
- flags & CRYPT_ACTIVATE_READONLY, 0, 0);
+
+ r = PLAIN_activate(cd, name, vk, cd->u.plain.hdr.size, flags);
} else if (isLUKS(cd->type)) {
r = key_from_file(cd, _("Enter passphrase: "), &passphrase_read,
- &passphrase_size_read, keyfile, keyfile_size);
+ &passphrase_size_read, keyfile, keyfile_offset, keyfile_size);
if (r < 0)
goto out;
- r = LUKS_open_key_with_hdr(cd->device, keyslot, passphrase_read,
- passphrase_size_read, &cd->hdr, &vk, cd);
+ r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
+ passphrase_size_read, &cd->u.luks1.hdr, &vk, cd);
if (r < 0)
goto out;
keyslot = r;
if (name) {
- r = open_from_hdr_and_vk(cd, vk, name, flags);
+ r = LUKS1_activate(cd, name, vk, flags);
if (r < 0)
goto out;
}
r = keyslot;
} else if (isLOOPAES(cd->type)) {
r = key_from_file(cd, NULL, &passphrase_read, &passphrase_size_read,
- keyfile, LOOPAES_KEYFILE_MAXSIZE);
+ keyfile, keyfile_offset, keyfile_size);
if (r < 0)
goto out;
- r = LOOPAES_parse_keyfile(cd, &vk, &key_count,
+ r = LOOPAES_parse_keyfile(cd, &vk, cd->u.loopaes.hdr.hash, &key_count,
passphrase_read, passphrase_size_read);
if (r < 0)
goto out;
if (name)
- r = LOOPAES_activate(cd, name, cd->loopaes_cipher,
+ r = LOOPAES_activate(cd, name, cd->u.loopaes.cipher,
key_count, vk, flags);
} else
r = -EINVAL;
return r;
}
+int crypt_activate_by_keyfile(struct crypt_device *cd,
+ const char *name,
+ int keyslot,
+ const char *keyfile,
+ size_t keyfile_size,
+ uint32_t flags)
+{
+ return crypt_activate_by_keyfile_offset(cd, name, keyslot, keyfile,
+ keyfile_size, 0, flags);
+}
+
int crypt_activate_by_volume_key(struct crypt_device *cd,
const char *name,
const char *volume_key,
uint32_t flags)
{
crypt_status_info ci;
- struct volume_key *vk;
- int r;
-
- log_dbg("Activating volume %s by volume key.", name);
-
- /* use key directly, no hash */
- if (isPLAIN(cd->type)) {
- if (!volume_key || !volume_key_size || !cd->volume_key ||
- volume_key_size != cd->volume_key->keylength) {
- log_err(cd, _("Incorrect volume key specified for plain device.\n"));
- return -EINVAL;
- }
-
- return create_device_helper(cd, name, NULL,
- cd->plain_cipher, cd->plain_cipher_mode, NULL, volume_key, volume_key_size,
- cd->volume_key->keylength, 0, cd->plain_hdr.skip,
- cd->plain_hdr.offset, cd->plain_uuid, flags & CRYPT_ACTIVATE_READONLY, 0, 0);
- }
+ struct volume_key *vk = NULL;
+ int r = -EINVAL;
- if (!isLUKS(cd->type)) {
- log_err(cd, _("Device type is not properly initialised.\n"));
- return -EINVAL;
- }
+ log_dbg("Activating volume %s by volume key.", name ?: "[none]");
if (name) {
ci = crypt_status(NULL, name);
}
}
- /* If key is not provided, try to use internal key */
- if (!volume_key) {
- if (!cd->volume_key) {
- log_err(cd, _("Volume key does not match the volume.\n"));
+ /* use key directly, no hash */
+ if (isPLAIN(cd->type)) {
+ if (!name)
+ return -EINVAL;
+
+ if (!volume_key || !volume_key_size || volume_key_size != cd->u.plain.key_size) {
+ log_err(cd, _("Incorrect volume key specified for plain device.\n"));
return -EINVAL;
}
- volume_key_size = cd->volume_key->keylength;
- volume_key = cd->volume_key->key;
- }
- vk = crypt_alloc_volume_key(volume_key_size, volume_key);
- if (!vk)
- return -ENOMEM;
- r = LUKS_verify_volume_key(&cd->hdr, vk);
+ vk = crypt_alloc_volume_key(volume_key_size, volume_key);
+ if (!vk)
+ return -ENOMEM;
- if (r == -EPERM)
- log_err(cd, _("Volume key does not match the volume.\n"));
+ r = PLAIN_activate(cd, name, vk, cd->u.plain.hdr.size, flags);
+ } else if (isLUKS(cd->type)) {
+ /* If key is not provided, try to use internal key */
+ if (!volume_key) {
+ if (!cd->volume_key) {
+ log_err(cd, _("Volume key does not match the volume.\n"));
+ return -EINVAL;
+ }
+ volume_key_size = cd->volume_key->keylength;
+ volume_key = cd->volume_key->key;
+ }
- if (!r && name)
- r = open_from_hdr_and_vk(cd, vk, name, flags);
+ vk = crypt_alloc_volume_key(volume_key_size, volume_key);
+ if (!vk)
+ return -ENOMEM;
+ r = LUKS_verify_volume_key(&cd->u.luks1.hdr, vk);
+
+ if (r == -EPERM)
+ log_err(cd, _("Volume key does not match the volume.\n"));
+
+ if (!r && name)
+ r = LUKS1_activate(cd, name, vk, flags);
+ } else if (isVERITY(cd->type)) {
+ /* volume_key == root hash */
+ if (!volume_key || !volume_key_size) {
+ log_err(cd, _("Incorrect root hash specified for verity device.\n"));
+ return -EINVAL;
+ }
+
+ r = VERITY_activate(cd, name, volume_key, volume_key_size,
+ &cd->u.verity.hdr, CRYPT_ACTIVATE_READONLY);
+
+ if (r == -EPERM) {
+ free(cd->u.verity.root_hash);
+ cd->u.verity.root_hash = NULL;
+ } if (!r) {
+ cd->u.verity.root_hash_size = volume_key_size;
+ if (!cd->u.verity.root_hash)
+ cd->u.verity.root_hash = malloc(volume_key_size);
+ if (cd->u.verity.root_hash)
+ memcpy(cd->u.verity.root_hash, volume_key, volume_key_size);
+ }
+ } else if (isTCRYPT(cd->type)) {
+ if (!name)
+ return 0;
+ r = TCRYPT_activate(cd, name, &cd->u.tcrypt.hdr,
+ &cd->u.tcrypt.params, flags);
+ } else
+ log_err(cd, _("Device type is not properly initialised.\n"));
crypt_free_volume_key(vk);
log_dbg("Deactivating volume %s.", name);
- if (!cd && dm_init(NULL, 1) < 0)
- return -ENOSYS;
+ if (!cd)
+ dm_backend_init();
switch (crypt_status(cd, name)) {
case CRYPT_ACTIVE:
- r = dm_remove_device(name, 0, 0);
- break;
case CRYPT_BUSY:
- log_err(cd, _("Device %s is busy.\n"), name);
- r = -EBUSY;
+ if (cd && isTCRYPT(cd->type))
+ r = TCRYPT_deactivate(cd, name);
+ else
+ r = dm_remove_device(cd, name, 0, 0);
break;
case CRYPT_INACTIVE:
log_err(cd, _("Device %s is not active.\n"), name);
}
if (!cd)
- dm_exit();
+ dm_backend_exit();
return r;
}
const char *passphrase,
size_t passphrase_size)
{
- struct volume_key *vk;
- char *processed_key = NULL;
- int r, key_len;
+ struct volume_key *vk = NULL;
+ unsigned key_len;
+ int r = -EINVAL;
+
+ if (crypt_fips_mode()) {
+ log_err(cd, "Function not available in FIPS mode.\n");
+ return -EACCES;
+ }
key_len = crypt_get_volume_key_size(cd);
if (key_len > *volume_key_size) {
return -ENOMEM;
}
- if (isPLAIN(cd->type) && cd->plain_hdr.hash) {
- processed_key = process_key(cd, cd->plain_hdr.hash, NULL, key_len,
- passphrase, passphrase_size);
- if (!processed_key) {
+ if (isPLAIN(cd->type) && cd->u.plain.hdr.hash) {
+ r = process_key(cd, cd->u.plain.hdr.hash, key_len,
+ passphrase, passphrase_size, &vk);
+ if (r < 0)
log_err(cd, _("Cannot retrieve volume key for plain device.\n"));
- return -EINVAL;
- }
- memcpy(volume_key, processed_key, key_len);
- *volume_key_size = key_len;
- crypt_safe_free(processed_key);
- return 0;
- }
-
- if (isLUKS(cd->type)) {
- r = LUKS_open_key_with_hdr(cd->device, keyslot, passphrase,
- passphrase_size, &cd->hdr, &vk, cd);
-
- if (r >= 0) {
- memcpy(volume_key, vk->key, vk->keylength);
- *volume_key_size = vk->keylength;
- }
+ } else if (isLUKS(cd->type)) {
+ r = LUKS_open_key_with_hdr(keyslot, passphrase,
+ passphrase_size, &cd->u.luks1.hdr, &vk, cd);
+ } else if (isTCRYPT(cd->type)) {
+ r = TCRYPT_get_volume_key(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params, &vk);
+ } else
+ log_err(cd, _("This operation is not supported for %s crypt device.\n"), cd->type ?: "(none)");
- crypt_free_volume_key(vk);
- return r;
+ if (r >= 0) {
+ memcpy(volume_key, vk->key, vk->keylength);
+ *volume_key_size = vk->keylength;
}
- log_err(cd, _("This operation is not supported for %s crypt device.\n"), cd->type ?: "(none)");
- return -EINVAL;
+ crypt_free_volume_key(vk);
+ return r;
}
int crypt_volume_key_verify(struct crypt_device *cd,
if (!vk)
return -ENOMEM;
- r = LUKS_verify_volume_key(&cd->hdr, vk);
+ r = LUKS_verify_volume_key(&cd->u.luks1.hdr, vk);
if (r == -EPERM)
log_err(cd, _("Volume key does not match the volume.\n"));
cd->tries = tries;
}
-void crypt_set_iterarion_time(struct crypt_device *cd, uint64_t iteration_time_ms)
+void crypt_set_iteration_time(struct crypt_device *cd, uint64_t iteration_time_ms)
{
log_dbg("Iteration time set to %" PRIu64 " miliseconds.", iteration_time_ms);
cd->iteration_time = iteration_time_ms;
}
+void crypt_set_iterarion_time(struct crypt_device *cd, uint64_t iteration_time_ms)
+{
+ crypt_set_iteration_time(cd, iteration_time_ms);
+}
void crypt_set_password_verify(struct crypt_device *cd, int password_verify)
{
{
int r;
- if (!cd && dm_init(NULL, 1) < 0)
- return CRYPT_INVALID;
+ if (!cd)
+ dm_backend_init();
- r = dm_status_device(name);
+ r = dm_status_device(cd, name);
if (!cd)
- dm_exit();
+ dm_backend_exit();
if (r < 0 && r != -ENODEV)
return CRYPT_INVALID;
return CRYPT_INACTIVE;
}
-static void hexprintICB(struct crypt_device *cd, char *d, int n)
+static void hexprint(struct crypt_device *cd, const char *d, int n, const char *sep)
{
int i;
for(i = 0; i < n; i++)
- log_std(cd, "%02hhx ", (char)d[i]);
+ log_std(cd, "%02hhx%s", (const char)d[i], sep);
}
-int crypt_dump(struct crypt_device *cd)
+static int _luks_dump(struct crypt_device *cd)
{
int i;
- if (!isLUKS(cd->type)) { //FIXME
- log_err(cd, _("This operation is supported only for LUKS device.\n"));
- return -EINVAL;
- }
- log_std(cd, "LUKS header information for %s\n\n", cd->device);
- log_std(cd, "Version: \t%d\n", cd->hdr.version);
- log_std(cd, "Cipher name: \t%s\n", cd->hdr.cipherName);
- log_std(cd, "Cipher mode: \t%s\n", cd->hdr.cipherMode);
- log_std(cd, "Hash spec: \t%s\n", cd->hdr.hashSpec);
- log_std(cd, "Payload offset:\t%d\n", cd->hdr.payloadOffset);
- log_std(cd, "MK bits: \t%d\n", cd->hdr.keyBytes * 8);
+ log_std(cd, "LUKS header information for %s\n\n", mdata_device_path(cd));
+ log_std(cd, "Version: \t%d\n", cd->u.luks1.hdr.version);
+ log_std(cd, "Cipher name: \t%s\n", cd->u.luks1.hdr.cipherName);
+ log_std(cd, "Cipher mode: \t%s\n", cd->u.luks1.hdr.cipherMode);
+ log_std(cd, "Hash spec: \t%s\n", cd->u.luks1.hdr.hashSpec);
+ log_std(cd, "Payload offset:\t%d\n", cd->u.luks1.hdr.payloadOffset);
+ log_std(cd, "MK bits: \t%d\n", cd->u.luks1.hdr.keyBytes * 8);
log_std(cd, "MK digest: \t");
- hexprintICB(cd, cd->hdr.mkDigest, LUKS_DIGESTSIZE);
+ hexprint(cd, cd->u.luks1.hdr.mkDigest, LUKS_DIGESTSIZE, " ");
log_std(cd, "\n");
log_std(cd, "MK salt: \t");
- hexprintICB(cd, cd->hdr.mkDigestSalt, LUKS_SALTSIZE/2);
+ hexprint(cd, cd->u.luks1.hdr.mkDigestSalt, LUKS_SALTSIZE/2, " ");
log_std(cd, "\n \t");
- hexprintICB(cd, cd->hdr.mkDigestSalt+LUKS_SALTSIZE/2, LUKS_SALTSIZE/2);
+ hexprint(cd, cd->u.luks1.hdr.mkDigestSalt+LUKS_SALTSIZE/2, LUKS_SALTSIZE/2, " ");
log_std(cd, "\n");
- log_std(cd, "MK iterations: \t%d\n", cd->hdr.mkDigestIterations);
- log_std(cd, "UUID: \t%s\n\n", cd->hdr.uuid);
+ log_std(cd, "MK iterations: \t%d\n", cd->u.luks1.hdr.mkDigestIterations);
+ log_std(cd, "UUID: \t%s\n\n", cd->u.luks1.hdr.uuid);
for(i = 0; i < LUKS_NUMKEYS; i++) {
- if(cd->hdr.keyblock[i].active == LUKS_KEY_ENABLED) {
+ if(cd->u.luks1.hdr.keyblock[i].active == LUKS_KEY_ENABLED) {
log_std(cd, "Key Slot %d: ENABLED\n",i);
log_std(cd, "\tIterations: \t%d\n",
- cd->hdr.keyblock[i].passwordIterations);
+ cd->u.luks1.hdr.keyblock[i].passwordIterations);
log_std(cd, "\tSalt: \t");
- hexprintICB(cd, cd->hdr.keyblock[i].passwordSalt,
- LUKS_SALTSIZE/2);
+ hexprint(cd, cd->u.luks1.hdr.keyblock[i].passwordSalt,
+ LUKS_SALTSIZE/2, " ");
log_std(cd, "\n\t \t");
- hexprintICB(cd, cd->hdr.keyblock[i].passwordSalt +
- LUKS_SALTSIZE/2, LUKS_SALTSIZE/2);
+ hexprint(cd, cd->u.luks1.hdr.keyblock[i].passwordSalt +
+ LUKS_SALTSIZE/2, LUKS_SALTSIZE/2, " ");
log_std(cd, "\n");
log_std(cd, "\tKey material offset:\t%d\n",
- cd->hdr.keyblock[i].keyMaterialOffset);
+ cd->u.luks1.hdr.keyblock[i].keyMaterialOffset);
log_std(cd, "\tAF stripes: \t%d\n",
- cd->hdr.keyblock[i].stripes);
+ cd->u.luks1.hdr.keyblock[i].stripes);
}
else
log_std(cd, "Key Slot %d: DISABLED\n", i);
}
+ return 0;
+}
+static int _verity_dump(struct crypt_device *cd)
+{
+ log_std(cd, "VERITY header information for %s\n", mdata_device_path(cd));
+ log_std(cd, "UUID: \t%s\n", cd->u.verity.uuid ?: "");
+ log_std(cd, "Hash type: \t%u\n", cd->u.verity.hdr.hash_type);
+ log_std(cd, "Data blocks: \t%" PRIu64 "\n", cd->u.verity.hdr.data_size);
+ log_std(cd, "Data block size: \t%u\n", cd->u.verity.hdr.data_block_size);
+ log_std(cd, "Hash block size: \t%u\n", cd->u.verity.hdr.hash_block_size);
+ log_std(cd, "Hash algorithm: \t%s\n", cd->u.verity.hdr.hash_name);
+ log_std(cd, "Salt: \t");
+ if (cd->u.verity.hdr.salt_size)
+ hexprint(cd, cd->u.verity.hdr.salt, cd->u.verity.hdr.salt_size, "");
+ else
+ log_std(cd, "-");
+ log_std(cd, "\n");
+ if (cd->u.verity.root_hash) {
+ log_std(cd, "Root hash: \t");
+ hexprint(cd, cd->u.verity.root_hash, cd->u.verity.root_hash_size, "");
+ log_std(cd, "\n");
+ }
return 0;
}
+int crypt_dump(struct crypt_device *cd)
+{
+ if (isLUKS(cd->type))
+ return _luks_dump(cd);
+ else if (isVERITY(cd->type))
+ return _verity_dump(cd);
+ else if (isTCRYPT(cd->type))
+ return TCRYPT_dump(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
+
+ log_err(cd, _("Dump operation is not supported for this device type.\n"));
+ return -EINVAL;
+}
+
const char *crypt_get_cipher(struct crypt_device *cd)
{
if (isPLAIN(cd->type))
- return cd->plain_cipher;
+ return cd->u.plain.cipher;
if (isLUKS(cd->type))
- return cd->hdr.cipherName;
+ return cd->u.luks1.hdr.cipherName;
if (isLOOPAES(cd->type))
- return cd->loopaes_cipher;
+ return cd->u.loopaes.cipher;
+
+ if (isTCRYPT(cd->type))
+ return cd->u.tcrypt.params.cipher;
return NULL;
}
const char *crypt_get_cipher_mode(struct crypt_device *cd)
{
if (isPLAIN(cd->type))
- return cd->plain_cipher_mode;
+ return cd->u.plain.cipher_mode;
if (isLUKS(cd->type))
- return cd->hdr.cipherMode;
+ return cd->u.luks1.hdr.cipherMode;
if (isLOOPAES(cd->type))
- return cd->loopaes_cipher_mode;
+ return cd->u.loopaes.cipher_mode;
+
+ if (isTCRYPT(cd->type))
+ return cd->u.tcrypt.params.mode;
return NULL;
}
const char *crypt_get_uuid(struct crypt_device *cd)
{
if (isLUKS(cd->type))
- return cd->hdr.uuid;
+ return cd->u.luks1.hdr.uuid;
if (isPLAIN(cd->type))
- return cd->plain_uuid;
+ return cd->u.plain.uuid;
if (isLOOPAES(cd->type))
- return cd->loopaes_uuid;
+ return cd->u.loopaes.uuid;
+
+ if (isVERITY(cd->type))
+ return cd->u.verity.uuid;
return NULL;
}
const char *crypt_get_device_name(struct crypt_device *cd)
{
- return cd->device;
+ const char *path = device_block_path(cd->device);
+
+ if (!path)
+ path = device_path(cd->device);
+
+ return path;
}
int crypt_get_volume_key_size(struct crypt_device *cd)
{
- if (isPLAIN(cd->type) && cd->volume_key)
- return cd->volume_key->keylength;
+ if (isPLAIN(cd->type))
+ return cd->u.plain.key_size;
if (isLUKS(cd->type))
- return cd->hdr.keyBytes;
+ return cd->u.luks1.hdr.keyBytes;
if (isLOOPAES(cd->type))
- return cd->loopaes_key_size;
+ return cd->u.loopaes.key_size;
+
+ if (isVERITY(cd->type))
+ return cd->u.verity.root_hash_size;
+
+ if (isTCRYPT(cd->type))
+ return cd->u.tcrypt.params.key_size;
return 0;
}
uint64_t crypt_get_data_offset(struct crypt_device *cd)
{
if (isPLAIN(cd->type))
- return cd->plain_hdr.offset;
+ return cd->u.plain.hdr.offset;
+
+ if (isLUKS(cd->type))
+ return cd->u.luks1.hdr.payloadOffset;
+
+ if (isLOOPAES(cd->type))
+ return cd->u.loopaes.hdr.offset;
+
+ if (isTCRYPT(cd->type))
+ return TCRYPT_get_data_offset(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
+
+ return 0;
+}
+
+uint64_t crypt_get_iv_offset(struct crypt_device *cd)
+{
+ if (isPLAIN(cd->type))
+ return cd->u.plain.hdr.skip;
if (isLUKS(cd->type))
- return cd->hdr.payloadOffset;
+ return 0;
if (isLOOPAES(cd->type))
- return cd->loopaes_hdr.offset;
+ return cd->u.loopaes.hdr.skip;
+
+ if (isTCRYPT(cd->type))
+ return TCRYPT_get_iv_offset(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
return 0;
}
return CRYPT_SLOT_INVALID;
}
- return LUKS_keyslot_info(&cd->hdr, keyslot);
+ return LUKS_keyslot_info(&cd->u.luks1.hdr, keyslot);
}
int crypt_keyslot_max(const char *type)
return -EINVAL;
}
+int crypt_keyslot_area(struct crypt_device *cd,
+ int keyslot,
+ uint64_t *offset,
+ uint64_t *length)
+{
+ if (!isLUKS(cd->type))
+ return -EINVAL;
+
+ return LUKS_keyslot_area(&cd->u.luks1.hdr, keyslot, offset, length);
+}
+
const char *crypt_get_type(struct crypt_device *cd)
{
return cd->type;
}
-int crypt_get_active_device(struct crypt_device *cd,
- const char *name,
+int crypt_get_verity_info(struct crypt_device *cd,
+ struct crypt_params_verity *vp)
+{
+ if (!isVERITY(cd->type) || !vp)
+ return -EINVAL;
+
+ vp->data_device = device_path(cd->device);
+ vp->hash_device = mdata_device_path(cd);
+ vp->hash_name = cd->u.verity.hdr.hash_name;
+ vp->salt = cd->u.verity.hdr.salt;
+ vp->salt_size = cd->u.verity.hdr.salt_size;
+ vp->data_block_size = cd->u.verity.hdr.data_block_size;
+ vp->hash_block_size = cd->u.verity.hdr.hash_block_size;
+ vp->data_size = cd->u.verity.hdr.data_size;
+ vp->hash_area_offset = cd->u.verity.hdr.hash_area_offset;
+ vp->hash_type = cd->u.verity.hdr.hash_type;
+ vp->flags = cd->u.verity.hdr.flags & CRYPT_VERITY_NO_HEADER;
+ return 0;
+}
+
+int crypt_get_active_device(struct crypt_device *cd, const char *name,
struct crypt_active_device *cad)
{
- int r, readonly;
+ struct crypt_dm_active_device dmd;
+ int r;
- r = dm_query_device(name, NULL, &cad->size, &cad->iv_offset, &cad->offset,
- NULL, NULL, NULL, &readonly, NULL, NULL);
+ r = dm_query_device(cd, name, 0, &dmd);
if (r < 0)
return r;
- cad->flags = readonly ? CRYPT_ACTIVATE_READONLY : 0;
+ if (dmd.target != DM_CRYPT && dmd.target != DM_VERITY)
+ return -ENOTSUP;
+
+ if (cd && isTCRYPT(cd->type)) {
+ cad->offset = TCRYPT_get_data_offset(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
+ cad->iv_offset = TCRYPT_get_iv_offset(cd, &cd->u.tcrypt.hdr, &cd->u.tcrypt.params);
+ } else {
+ cad->offset = dmd.u.crypt.offset;
+ cad->iv_offset = dmd.u.crypt.iv_offset;
+ }
+ cad->size = dmd.size;
+ cad->flags = dmd.flags;
return 0;
}