X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fsetup.c;h=38ec6d5958c8ef6c74ee6df3bd5f7be668845a0f;hb=ecf993834cfdfc3ff9e3584845ffce9a5b967184;hp=e91bf493df363f79b5cb1556a895ba65f9edf522;hpb=906c7897e154285fbfe7bbeecfeafffc0f2a0e60;p=platform%2Fupstream%2Fcryptsetup.git

diff --git a/lib/setup.c b/lib/setup.c
index e91bf49..38ec6d5 100644
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004, Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2009-2011, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <string.h>
@@ -29,17 +29,16 @@
 #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;
-	char *metadata_device;
+	struct device *device;
+	struct device *metadata_device;
 
-	char *backing_file;
-	int loop_fd;
 	struct volume_key *volume_key;
 	uint64_t timeout;
 	uint64_t iteration_time;
@@ -56,6 +55,7 @@ struct crypt_device {
 	char *plain_cipher;
 	char *plain_cipher_mode;
 	char *plain_uuid;
+	unsigned int plain_key_size;
 
 	/* used in CRYPT_LOOPAES */
 	struct crypt_params_loopaes loopaes_hdr;
@@ -64,6 +64,16 @@ struct crypt_device {
 	char *loopaes_uuid;
 	unsigned int loopaes_key_size;
 
+	/* used in CRYPT_VERITY */
+	struct crypt_params_verity verity_hdr;
+	char *verity_root_hash;
+	unsigned int verity_root_hash_size;
+	char *verity_uuid;
+
+	/* used in CRYPT_TCRYPT */
+	struct crypt_params_tcrypt tcrypt_params;
+	struct tcrypt_phdr tcrypt_hdr;
+
 	/* callbacks definitions */
 	void (*log)(int level, const char *msg, void *usrptr);
 	void *log_usrptr;
@@ -71,8 +81,15 @@ struct crypt_device {
 	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;
@@ -87,12 +104,32 @@ 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)))
@@ -104,7 +141,7 @@ void logger(struct crypt_device *cd, int level, const char *file,
 
 	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
@@ -120,15 +157,28 @@ void logger(struct crypt_device *cd, int level, const char *file,
 	free(target);
 }
 
-static const char *mdata_device(struct crypt_device *cd)
+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;
 }
 
-static int init_crypto(struct crypt_device *ctx)
+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"));
@@ -139,6 +189,7 @@ static int init_crypto(struct crypt_device *ctx)
 	if (r < 0)
 		log_err(ctx, _("Cannot initialize crypto backend.\n"));
 
+	log_dbg("Crypto backend (%s) initialized.", crypt_backend_version());
 	return r;
 }
 
@@ -192,6 +243,16 @@ static int isLOOPAES(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)
 {
@@ -257,20 +318,28 @@ int PLAIN_activate(struct crypt_device *cd,
 {
 	int r;
 	char *dm_cipher = NULL;
+	enum devcheck device_check;
 	struct crypt_dm_active_device dmd = {
-		.device = crypt_get_device_name(cd),
-		.cipher = NULL,
+		.target = DM_CRYPT,
 		.uuid   = crypt_get_uuid(cd),
-		.vk    = vk,
-		.offset = crypt_get_data_offset(cd),
-		.iv_offset = crypt_get_iv_offset(cd),
 		.size   = size,
-		.flags  = flags
+		.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),
+		}
 	};
 
-	r = device_check_and_adjust(cd, dmd.device,
-				    (dmd.flags & CRYPT_ACTIVATE_SHARED) ? DEV_SHARED : DEV_EXCL,
-				    &dmd.size, &dmd.offset, &flags);
+	if (dmd.flags & CRYPT_ACTIVATE_SHARED)
+		device_check = DEV_SHARED;
+	else
+		device_check = DEV_EXCL;
+
+	r = device_block_adjust(cd, dmd.data_device, device_check,
+				dmd.u.crypt.offset, &dmd.size, &dmd.flags);
 	if (r)
 		return r;
 
@@ -281,13 +350,14 @@ int PLAIN_activate(struct crypt_device *cd,
 	if (r < 0)
 		return -ENOMEM;
 
-	dmd.cipher = dm_cipher;
-	log_dbg("Trying to activate PLAIN device %s using cipher %s.", name, dmd.cipher);
+	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, CRYPT_PLAIN, &dmd, 0);
+	r = dm_create_device(cd, name, CRYPT_PLAIN, &dmd, 0);
 
 	// FIXME
-	if (!cd->plain_uuid && dm_query_device(name, DM_ACTIVE_UUID, &dmd) >= 0)
+	if (!cd->plain_uuid && dm_query_device(cd, name, DM_ACTIVE_UUID, &dmd) >= 0)
 		cd->plain_uuid = CONST_CAST(char*)dmd.uuid;
 
 	free(dm_cipher);
@@ -305,16 +375,23 @@ int crypt_confirm(struct crypt_device *cd, const char *msg)
 static int key_from_terminal(struct crypt_device *cd, char *msg, char **key,
 			      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->backing_file ?: crypt_get_device_name(cd)) < 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(DEFAULT_PASSPHRASE_SIZE_MAX);
@@ -330,7 +407,7 @@ static int key_from_terminal(struct crypt_device *cd, char *msg, char **key,
 		} 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);
@@ -351,10 +428,13 @@ static int volume_key_by_terminal_passphrase(struct crypt_device *cd, int keyslo
 
 		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(mdata_device(cd), keyslot, passphrase_read,
+		r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
 					   passphrase_size_read, &cd->hdr, vk, cd);
 		if (r == -EPERM)
 			eperm = 1;
@@ -377,9 +457,10 @@ out:
 
 static int key_from_file(struct crypt_device *cd, char *msg,
 			  char **key, size_t *key_len,
-			  const char *key_file, size_t key_size)
+			  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);
 }
 
@@ -411,20 +492,30 @@ void crypt_set_password_callback(struct crypt_device *cd,
 	cd->password_usrptr = usrptr;
 }
 
-void crypt_get_error(char *buf, size_t size)
+static void _get_error(char *error, char *buf, size_t size)
 {
-	const char *error = get_error();
-
 	if (!buf || size < 1)
-		set_error(NULL);
-	else if (error) {
+		error[0] = '\0';
+	else if (*error) {
 		strncpy(buf, error, size - 1);
 		buf[size - 1] = '\0';
-		set_error(NULL);
+		error[0] = '\0';
 	} else
 		buf[0] = '\0';
 }
 
+void crypt_last_error(struct crypt_device *cd, char *buf, size_t size)
+{
+	if (cd)
+		return _get_error(cd->error, buf, size);
+}
+
+/* Deprecated global error interface */
+void crypt_get_error(char *buf, size_t size)
+{
+	return _get_error(global_error, buf, size);
+}
+
 const char *crypt_get_dir(void)
 {
 	return dm_get_dir();
@@ -433,7 +524,7 @@ const char *crypt_get_dir(void)
 int crypt_init(struct crypt_device **cd, const char *device)
 {
 	struct crypt_device *h = NULL;
-	int r, readonly = 0;
+	int r;
 
 	if (!cd)
 		return -EINVAL;
@@ -444,49 +535,12 @@ int crypt_init(struct crypt_device **cd, const char *device)
 		return -ENOMEM;
 
 	memset(h, 0, sizeof(*h));
-	h->loop_fd = -1;
-
-	if (device) {
-		r = device_ready(NULL, device, O_RDONLY);
-		if (r == -ENOTBLK) {
-			h->device = crypt_loop_get_device();
-			log_dbg("Not a block device, %s%s.",
-				h->device ? "using free loop device " :
-					 "no free loop device found",
-				h->device ?: "");
-			if (!h->device) {
-				log_err(NULL, _("Cannot find a free loopback device.\n"));
-				r = -ENOSYS;
-				goto bad;
-			}
-
-			/* Keep the loop open, dettached on last close. */
-			h->loop_fd = crypt_loop_attach(h->device, device, 0, 1, &readonly);
-			if (h->loop_fd == -1) {
-				log_err(NULL, _("Attaching loopback device failed "
-					"(loop device with autoclear flag is required).\n"));
-				r = -EINVAL;
-				goto bad;
-			}
 
-			h->backing_file = crypt_loop_backing_file(h->device);
-			r = device_ready(NULL, h->device, O_RDONLY);
-		}
-		if (r < 0) {
-			r = -ENOTBLK;
-			goto bad;
-		}
-	}
-
-	if (!h->device && device && !(h->device = strdup(device))) {
-		r = -ENOMEM;
+	r = device_alloc(&h->device, device);
+	if (r < 0)
 		goto bad;
-	}
 
-	if (dm_init(h, 1) < 0) {
-		r = -ENOSYS;
-		goto bad;
-	}
+	dm_backend_init();
 
 	h->iteration_time = 1000;
 	h->password_verify = 0;
@@ -495,13 +549,7 @@ int crypt_init(struct crypt_device **cd, const char *device)
 	*cd = h;
 	return 0;
 bad:
-
-	if (h) {
-		if (h->loop_fd != -1)
-			close(h->loop_fd);
-		free(h->device);
-		free(h->backing_file);
-	}
+	device_free(h->device);
 	free(h);
 	return r;
 }
@@ -512,15 +560,15 @@ static int crypt_check_data_device_size(struct crypt_device *cd)
 	uint64_t size, size_min;
 
 	/* Check data device size, require at least one sector */
-	size_min = crypt_get_data_offset(cd) ?: SECTOR_SIZE;
+	size_min = crypt_get_data_offset(cd) << SECTOR_SHIFT ?: SECTOR_SIZE;
 
-	r = device_size(crypt_get_device_name(cd), &size);
+	r = device_size(cd->device, &size);
 	if (r < 0)
 		return r;
 
 	if (size < size_min) {
-		log_err(cd, _("LUKS header detected but device %s is too small.\n"),
-			crypt_get_device_name(cd));
+		log_err(cd, _("Header detected but device %s is too small.\n"),
+			device_path(cd->device));
 		return -EINVAL;
 	}
 
@@ -529,46 +577,236 @@ static int crypt_check_data_device_size(struct crypt_device *cd)
 
 int crypt_set_data_device(struct crypt_device *cd, const char *device)
 {
-	char *data_device;
+	struct device *dev = NULL;
 	int r;
 
 	log_dbg("Setting ciphertext data device to %s.", device ?: "(none)");
 
-	if (!isLUKS(cd->type)) {
+	if (!isLUKS(cd->type) && !isVERITY(cd->type)) {
 		log_err(cd, _("This operation is not supported for this device type.\n"));
 		return  -EINVAL;
 	}
 
 	/* metadata device must be set */
-	if (!cd->device)
+	if (!cd->device || !device)
 		return -EINVAL;
 
-	r = device_ready(NULL, device, O_RDONLY);
+	r = device_alloc(&dev, device);
 	if (r < 0)
 		return r;
 
-	if (!(data_device = strdup(device)))
-		return -ENOMEM;
-
-	if (!cd->metadata_device)
+	if (!cd->metadata_device) {
 		cd->metadata_device = cd->device;
-	else
-		free(cd->device);
+	} else
+		device_free(cd->device);
 
-	cd->device = data_device;
+	cd->device = dev;
 
 	return crypt_check_data_device_size(cd);
 }
 
+static int _crypt_load_luks1(struct crypt_device *cd, int require_header, int repair)
+{
+	struct luks_phdr hdr;
+	int r;
+
+	r = init_crypto(cd);
+	if (r < 0)
+		return r;
+
+	r = LUKS_read_phdr(&hdr, require_header, repair, cd);
+	if (r < 0)
+		return r;
+
+	if (!cd->type && !(cd->type = strdup(CRYPT_LUKS1)))
+		return -ENOMEM;
+
+	memcpy(&cd->hdr, &hdr, sizeof(hdr));
+
+	return r;
+}
+
+static int _crypt_load_tcrypt(struct crypt_device *cd, struct crypt_params_tcrypt *params)
+{
+	int r;
+
+	r = init_crypto(cd);
+	if (r < 0)
+		return r;
+
+	memcpy(&cd->tcrypt_params, params, sizeof(*params));
+
+	r = TCRYPT_read_phdr(cd, &cd->tcrypt_hdr, &cd->tcrypt_params);
+
+	cd->tcrypt_params.passphrase = NULL;
+	cd->tcrypt_params.passphrase_size = 0;
+	cd->tcrypt_params.keyfiles = NULL;
+	cd->tcrypt_params.keyfiles_count = 0;
+
+	if (r < 0)
+		return r;
+
+	if (!cd->type && !(cd->type = strdup(CRYPT_TCRYPT)))
+		return -ENOMEM;
+
+	return r;
+}
+
+static int _crypt_load_verity(struct crypt_device *cd, struct crypt_params_verity *params)
+{
+	int r;
+	size_t sb_offset = 0;
+
+	r = init_crypto(cd);
+	if (r < 0)
+		return r;
+
+	if (params && params->flags & CRYPT_VERITY_NO_HEADER)
+		return -EINVAL;
+
+	if (params)
+		sb_offset = params->hash_area_offset;
+
+	r = VERITY_read_sb(cd, sb_offset, &cd->verity_uuid, &cd->verity_hdr);
+	if (r < 0)
+		return r;
+
+	if (params)
+		cd->verity_hdr.flags = params->flags;
+
+	/* Hash availability checked in sb load */
+	cd->verity_root_hash_size = crypt_hash_size(cd->verity_hdr.hash_name);
+	if (cd->verity_root_hash_size > 4096)
+		return -EINVAL;
+
+	if (!cd->type && !(cd->type = strdup(CRYPT_VERITY)))
+		return -ENOMEM;
+
+	if (params && params->data_device &&
+	    (r = crypt_set_data_device(cd, params->data_device)) < 0)
+		return r;
+
+	return r;
+}
+
+static int _init_by_name_crypt(struct crypt_device *cd, const char *name)
+{
+	struct crypt_dm_active_device dmd = {};
+	char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
+	int key_nums, r;
+
+	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;
+
+	if (isPLAIN(cd->type)) {
+		cd->plain_uuid = dmd.uuid ? strdup(dmd.uuid) : NULL;
+		cd->plain_hdr.hash = NULL; /* no way to get this */
+		cd->plain_hdr.offset = dmd.u.crypt.offset;
+		cd->plain_hdr.skip = dmd.u.crypt.iv_offset;
+		cd->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->plain_cipher = strdup(cipher);
+			cd->plain_cipher_mode = strdup(cipher_mode);
+		}
+	} else if (isLOOPAES(cd->type)) {
+		cd->loopaes_uuid = dmd.uuid ? strdup(dmd.uuid) : NULL;
+		cd->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->loopaes_cipher = strdup(cipher);
+			cd->loopaes_cipher_mode = strdup(cipher_mode);
+			/* version 3 uses last key for IV */
+			if (dmd.u.crypt.vk->keylength % key_nums)
+				key_nums++;
+			cd->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->hdr.uuid);
+			if (r < 0) {
+				log_dbg("LUKS device header uuid: %s mismatches DM returned uuid %s",
+					cd->hdr.uuid, dmd.uuid);
+				free(cd->type);
+				cd->type = NULL;
+				r = 0;
+				goto out;
+			}
+		}
+	}
+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;
+}
+
+static int _init_by_name_verity(struct crypt_device *cd, const char *name)
+{
+	struct crypt_params_verity params = {};
+	struct crypt_dm_active_device dmd = {
+		.target = DM_VERITY,
+		.u.verity.vp = &params,
+	};
+	int r;
+
+	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 (isVERITY(cd->type)) {
+		cd->verity_uuid = dmd.uuid ? strdup(dmd.uuid) : NULL;
+		cd->verity_hdr.flags = CRYPT_VERITY_NO_HEADER; //FIXME
+		cd->verity_hdr.data_size = params.data_size;
+		cd->verity_root_hash_size = dmd.u.verity.root_hash_size;
+		cd->verity_root_hash = NULL;
+		cd->verity_hdr.hash_name = params.hash_name;
+		cd->verity_hdr.data_device = NULL;
+		cd->verity_hdr.hash_device = NULL;
+		cd->verity_hdr.data_block_size = params.data_block_size;
+		cd->verity_hdr.hash_block_size = params.hash_block_size;
+		cd->verity_hdr.hash_area_offset = dmd.u.verity.hash_offset;
+		cd->verity_hdr.hash_type = params.hash_type;
+		cd->verity_hdr.flags = params.flags;
+		cd->verity_hdr.salt_size = params.salt_size;
+		cd->verity_hdr.salt = params.salt;
+		cd->metadata_device = dmd.u.verity.hash_device;
+	}
+out:
+	device_free(dmd.data_device);
+	free(CONST_CAST(void*)dmd.uuid);
+	return r;
+}
+
 int crypt_init_by_name_and_header(struct crypt_device **cd,
 				  const char *name,
 				  const char *header_device)
 {
 	crypt_status_info ci;
 	struct crypt_dm_active_device dmd;
-	char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
-	int key_nums, r;
-
+	int r;
 
 	log_dbg("Allocating crypt device context by device %s.", name);
 
@@ -581,8 +819,7 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
 		return -ENODEV;
 	}
 
-	r = dm_query_device(name, DM_ACTIVE_DEVICE | DM_ACTIVE_CIPHER |
-				  DM_ACTIVE_UUID | DM_ACTIVE_KEYSIZE, &dmd);
+	r = dm_query_device(NULL, name, DM_ACTIVE_DEVICE | DM_ACTIVE_UUID, &dmd);
 	if (r < 0)
 		goto out;
 
@@ -591,17 +828,17 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
 	if (header_device) {
 		r = crypt_init(cd, header_device);
 	} else {
-		r = crypt_init(cd, dmd.device);
+		r = crypt_init(cd, device_path(dmd.data_device));
 
 		/* Underlying device disappeared but mapping still active */
-		if (!dmd.device || r == -ENOTBLK)
+		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) {
-			free(CONST_CAST(void*)dmd.device);
-			dmd.device = NULL;
+			device_free(dmd.data_device);
+			dmd.data_device = NULL;
 			r = crypt_init(cd, NULL);
 		}
 	}
@@ -616,83 +853,31 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
 			(*cd)->type = strdup(CRYPT_LOOPAES);
 		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
 			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, dmd.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 (!(*cd)->backing_file && dmd.device && crypt_loop_device(dmd.device) &&
-	    !((*cd)->backing_file = crypt_loop_backing_file(dmd.device))) {
-		r = -ENOMEM;
-		goto out;
-	}
-
-	if (isPLAIN((*cd)->type)) {
-		(*cd)->type = strdup(CRYPT_PLAIN);
-		(*cd)->plain_uuid = strdup(dmd.uuid);
-		(*cd)->plain_hdr.hash = NULL; /* no way to get this */
-		(*cd)->plain_hdr.offset = dmd.offset;
-		(*cd)->plain_hdr.skip = dmd.iv_offset;
-
-		r = crypt_parse_name_and_mode(dmd.cipher, cipher, NULL, cipher_mode);
-		if (!r) {
-			(*cd)->plain_cipher = strdup(cipher);
-			(*cd)->plain_cipher_mode = strdup(cipher_mode);
-		}
-	} else if (isLOOPAES((*cd)->type)) {
-		(*cd)->type = strdup(CRYPT_LOOPAES);
-		(*cd)->loopaes_uuid = strdup(dmd.uuid);
-		(*cd)->loopaes_hdr.offset = dmd.offset;
-
-		r = crypt_parse_name_and_mode(dmd.cipher, 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 (dmd.vk->keylength % key_nums)
-				key_nums++;
-			(*cd)->loopaes_key_size = dmd.vk->keylength / key_nums;
-		}
-	} else if (isLUKS((*cd)->type)) {
-		if (mdata_device(*cd)) {
-			r = crypt_load(*cd, CRYPT_LUKS1, NULL);
-			if (r < 0) {
-				log_dbg("LUKS device header does not match active device.");
-				free((*cd)->type);
-				(*cd)->type = NULL;
-				r = 0;
-				goto out;
-			}
-			/* checks whether UUIDs match each other */
-			r = crypt_uuid_cmp(dmd.uuid, (*cd)->hdr.uuid);
-			if (r < 0) {
-				log_dbg("LUKS device header uuid: %s mismatches DM returned uuid %s",
-					(*cd)->hdr.uuid, dmd.uuid);
-				free((*cd)->type);
-				(*cd)->type = NULL;
-				r = 0;
-				goto out;
-			}
-		}
-	}
-
+	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_free_volume_key(dmd.vk);
-	free(CONST_CAST(void*)dmd.device);
-	free(CONST_CAST(void*)dmd.cipher);
+	device_free(dmd.data_device);
 	free(CONST_CAST(void*)dmd.uuid);
 	return r;
 }
@@ -719,6 +904,10 @@ static int _crypt_format_plain(struct crypt_device *cd,
 		return -EINVAL;
 	}
 
+	if (!(cd->type = strdup(CRYPT_PLAIN)))
+		return -ENOMEM;
+
+	cd->plain_key_size = volume_key_size;
 	cd->volume_key = crypt_alloc_volume_key(volume_key_size, NULL);
 	if (!cd->volume_key)
 		return -ENOMEM;
@@ -754,11 +943,14 @@ static int _crypt_format_luks1(struct crypt_device *cd,
 	unsigned long required_alignment = DEFAULT_DISK_ALIGNMENT;
 	unsigned long alignment_offset = 0;
 
-	if (!mdata_device(cd)) {
+	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);
@@ -770,39 +962,50 @@ static int _crypt_format_luks1(struct crypt_device *cd,
 
 	if (params && params->data_device) {
 		cd->metadata_device = cd->device;
-		if (!(cd->device = strdup(params->data_device)))
+		cd->device = NULL;
+		if (device_alloc(&cd->device, params->data_device) < 0)
 			return -ENOMEM;
 		required_alignment = params->data_alignment * SECTOR_SIZE;
 	} else if (params && params->data_alignment) {
 		required_alignment = params->data_alignment * SECTOR_SIZE;
 	} else
-		get_topology_alignment(cd->device, &required_alignment,
+		device_topology_alignment(cd->device,
+				       &required_alignment,
 				       &alignment_offset, DEFAULT_DISK_ALIGNMENT);
 
+	/* 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->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->metadata_device, cd);
+			       cd->metadata_device ? 1 : 0, cd);
 	if(r < 0)
 		return r;
 
 	/* Wipe first 8 sectors - fs magic numbers etc. */
-	r = wipe_device_header(mdata_device(cd), 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"),
-				mdata_device(cd));
-		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"),
-				mdata_device(cd));
+				mdata_device_path(cd));
 
 		return r;
 	}
 
-	r = LUKS_write_phdr(mdata_device(cd), &cd->hdr, cd);
+	r = LUKS_write_phdr(&cd->hdr, cd);
 
 	return r;
 }
@@ -813,7 +1016,7 @@ static int _crypt_format_loopaes(struct crypt_device *cd,
 				 size_t volume_key_size,
 				 struct crypt_params_loopaes *params)
 {
-	if (!mdata_device(cd)) {
+	if (!crypt_metadata_device(cd)) {
 		log_err(cd, _("Can't format LOOPAES without device.\n"));
 		return -EINVAL;
 	}
@@ -823,6 +1026,9 @@ static int _crypt_format_loopaes(struct crypt_device *cd,
 		return -EINVAL;
 	}
 
+	if (!(cd->type = strdup(CRYPT_LOOPAES)))
+		return -ENOMEM;
+
 	cd->loopaes_key_size = volume_key_size;
 
 	cd->loopaes_cipher = strdup(cipher ?: DEFAULT_LOOPAES_CIPHER);
@@ -839,6 +1045,109 @@ static int _crypt_format_loopaes(struct crypt_device *cd,
 	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->verity_hdr.data_size = data_device_size / params->data_block_size;
+	} else
+		cd->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->verity_root_hash_size = hash_size;
+
+	cd->verity_root_hash = malloc(cd->verity_root_hash_size);
+	if (!cd->verity_root_hash)
+		return -ENOMEM;
+
+	cd->verity_hdr.flags = params->flags;
+	if (!(cd->verity_hdr.hash_name = strdup(params->hash_name)))
+		return -ENOMEM;
+	cd->verity_hdr.data_device = NULL;
+	cd->verity_hdr.data_block_size = params->data_block_size;
+	cd->verity_hdr.hash_block_size = params->hash_block_size;
+	cd->verity_hdr.hash_area_offset = params->hash_area_offset;
+	cd->verity_hdr.hash_type = params->hash_type;
+	cd->verity_hdr.flags = params->flags;
+	cd->verity_hdr.salt_size = params->salt_size;
+	if (!(cd->verity_hdr.salt = malloc(params->salt_size)))
+		return -ENOMEM;
+
+	if (params->salt)
+		memcpy(CONST_CAST(char*)cd->verity_hdr.salt, params->salt,
+		       params->salt_size);
+	else
+		r = crypt_random_get(cd, CONST_CAST(char*)cd->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->verity_hdr,
+				  cd->verity_root_hash, cd->verity_root_hash_size);
+		if (r)
+			return r;
+	}
+
+	if (!(params->flags & CRYPT_VERITY_NO_HEADER)) {
+		if (uuid)
+			cd->verity_uuid = strdup(uuid);
+		else {
+			r = VERITY_UUID_generate(cd, &cd->verity_uuid);
+			if (r)
+				return r;
+		}
+
+		r = VERITY_write_sb(cd, cd->verity_hdr.hash_area_offset,
+				    cd->verity_uuid,
+				    &cd->verity_hdr);
+	}
+	return r;
+}
+
 int crypt_format(struct crypt_device *cd,
 	const char *type,
 	const char *cipher,
@@ -853,7 +1162,12 @@ int crypt_format(struct crypt_device *cd,
 	if (!type)
 		return -EINVAL;
 
-	log_dbg("Formatting device %s as type %s.", mdata_device(cd) ?: "(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)
@@ -867,16 +1181,16 @@ int crypt_format(struct crypt_device *cd,
 					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;
 	}
@@ -886,38 +1200,62 @@ int crypt_format(struct crypt_device *cd,
 
 int crypt_load(struct crypt_device *cd,
 	       const char *requested_type,
-	       void *params __attribute__((unused)))
+	       void *params)
 {
-	struct luks_phdr hdr;
 	int r;
 
 	log_dbg("Trying to load %s crypt type from device %s.",
-		requested_type ?: "any", mdata_device(cd) ?: "(none)");
+		requested_type ?: "any", mdata_device_path(cd) ?: "(none)");
 
-	if (!mdata_device(cd))
+	if (!crypt_metadata_device(cd))
 		return -EINVAL;
 
-	if (requested_type && !isLUKS(requested_type))
+	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;
 
-	if (cd->type && !isLUKS(cd->type)) {
-		log_dbg("Context is already initialised to type %s", cd->type);
+	return r;
+}
+
+int crypt_repair(struct crypt_device *cd,
+		 const char *requested_type,
+		 void *params __attribute__((unused)))
+{
+	int r;
+
+	log_dbg("Trying to repair %s crypt type from device %s.",
+		requested_type ?: "any", mdata_device_path(cd) ?: "(none)");
+
+	if (!crypt_metadata_device(cd))
 		return -EINVAL;
-	}
 
-	r = init_crypto(cd);
-	if (r < 0)
-		return r;
+	if (requested_type && !isLUKS(requested_type))
+		return -EINVAL;
 
-	r = LUKS_read_phdr(mdata_device(cd), &hdr, 1, cd);
+
+	/* Load with repair */
+	r = _crypt_load_luks1(cd, 1, 1);
 	if (r < 0)
 		return r;
 
-	if (!cd->type && !(cd->type = strdup(CRYPT_LUKS1)))
-		return -ENOMEM;
-
-	memcpy(&cd->hdr, &hdr, sizeof(hdr));
-
 	/* cd->type and header must be set in context */
 	r = crypt_check_data_device_size(cd);
 	if (r < 0) {
@@ -939,20 +1277,21 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size)
 
 	log_dbg("Resizing device %s to %" PRIu64 " sectors.", name, new_size);
 
-	r = dm_query_device(name, DM_ACTIVE_DEVICE | DM_ACTIVE_CIPHER |
-				  DM_ACTIVE_UUID | DM_ACTIVE_KEYSIZE |
-				  DM_ACTIVE_KEY, &dmd);
+	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 (!dmd.uuid) {
+	if (!dmd.uuid || dmd.target != DM_CRYPT) {
 		r = -EINVAL;
 		goto out;
 	}
 
-	r = device_check_and_adjust(cd, dmd.device, DEV_OK, &new_size, &dmd.offset, &dmd.flags);
+	r = device_block_adjust(cd, dmd.data_device, DEV_OK,
+				dmd.u.crypt.offset, &new_size, &dmd.flags);
 	if (r)
 		goto out;
 
@@ -962,12 +1301,14 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size)
 		r = 0;
 	} else {
 		dmd.size = new_size;
-		r = dm_create_device(name, cd->type, &dmd, 1);
+		r = dm_create_device(cd, name, cd->type, &dmd, 1);
 	}
 out:
-	crypt_free_volume_key(dmd.vk);
-	free(CONST_CAST(void*)dmd.cipher);
-	free(CONST_CAST(void*)dmd.device);
+	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;
@@ -982,19 +1323,19 @@ int crypt_set_uuid(struct crypt_device *cd, const char *uuid)
 
 	if (uuid && !strncmp(uuid, cd->hdr.uuid, sizeof(cd->hdr.uuid))) {
 		log_dbg("UUID is the same as requested (%s) for device %s.",
-			uuid, mdata_device(cd));
+			uuid, mdata_device_path(cd));
 		return 0;
 	}
 
 	if (uuid)
-		log_dbg("Requested new UUID change to %s for %s.", uuid, mdata_device(cd));
+		log_dbg("Requested new UUID change to %s for %s.", uuid, mdata_device_path(cd));
 	else
-		log_dbg("Requested new UUID refresh for %s.", mdata_device(cd));
+		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(mdata_device(cd), &cd->hdr, uuid, cd);
+	return LUKS_hdr_uuid_set(&cd->hdr, uuid, cd);
 }
 
 int crypt_header_backup(struct crypt_device *cd,
@@ -1011,9 +1352,9 @@ int crypt_header_backup(struct crypt_device *cd,
 		return r;
 
 	log_dbg("Requested header backup of device %s (%s) to "
-		"file %s.", mdata_device(cd), requested_type, backup_file);
+		"file %s.", mdata_device_path(cd), requested_type, backup_file);
 
-	return LUKS_hdr_backup(backup_file, mdata_device(cd), &cd->hdr, cd);
+	return LUKS_hdr_backup(backup_file, &cd->hdr, cd);
 }
 
 int crypt_header_restore(struct crypt_device *cd,
@@ -1025,31 +1366,26 @@ int crypt_header_restore(struct crypt_device *cd,
 	if (requested_type && !isLUKS(requested_type))
 		return -EINVAL;
 
-	/* Some hash functions need initialized gcrypt library */
 	r = init_crypto(cd);
 	if (r < 0)
 		return r;
 
 	log_dbg("Requested header restore to device %s (%s) from "
-		"file %s.", mdata_device(cd), requested_type, backup_file);
+		"file %s.", mdata_device_path(cd), requested_type, backup_file);
 
-	return LUKS_hdr_restore(backup_file, mdata_device(cd), &cd->hdr, cd);
+	return LUKS_hdr_restore(backup_file, &cd->hdr, cd);
 }
 
 void crypt_free(struct crypt_device *cd)
 {
 	if (cd) {
-		log_dbg("Releasing crypt device %s context.", mdata_device(cd));
-
-		if (cd->loop_fd != -1)
-			close(cd->loop_fd);
+		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->metadata_device);
-		free(cd->backing_file);
+		device_free(cd->device);
+		device_free(cd->metadata_device);
 		free(cd->type);
 
 		/* used in plain device only */
@@ -1063,6 +1399,12 @@ void crypt_free(struct crypt_device *cd)
 		free(cd->loopaes_cipher);
 		free(cd->loopaes_uuid);
 
+		/* used in verity device only */
+		free(CONST_CAST(void*)cd->verity_hdr.hash_name);
+		free(CONST_CAST(void*)cd->verity_hdr.salt);
+		free(cd->verity_root_hash);
+		free(cd->verity_uuid);
+
 		free(cd);
 	}
 }
@@ -1075,7 +1417,7 @@ int crypt_suspend(struct crypt_device *cd,
 
 	log_dbg("Suspending volume %s.", name);
 
-	if (!isLUKS(cd->type)) {
+	if (!cd || !isLUKS(cd->type)) {
 		log_err(cd, _("This operation is supported only for LUKS device.\n"));
 		r = -EINVAL;
 		goto out;
@@ -1087,10 +1429,9 @@ int crypt_suspend(struct crypt_device *cd,
 		return -EINVAL;
 	}
 
-	if (!cd && dm_init(NULL, 1) < 0)
-		return -ENOSYS;
+	dm_backend_init();
 
-	r = dm_status_suspended(name);
+	r = dm_status_suspended(cd, name);
 	if (r < 0)
 		goto out;
 
@@ -1100,14 +1441,13 @@ int crypt_suspend(struct crypt_device *cd,
 		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;
 }
 
@@ -1128,7 +1468,7 @@ int crypt_resume_by_passphrase(struct crypt_device *cd,
 		goto out;
 	}
 
-	r = dm_status_suspended(name);
+	r = dm_status_suspended(cd, name);
 	if (r < 0)
 		return r;
 
@@ -1138,14 +1478,14 @@ int crypt_resume_by_passphrase(struct crypt_device *cd,
 	}
 
 	if (passphrase) {
-		r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase,
-					   passphrase_size, &cd->hdr, &vk, cd);
+		r = LUKS_open_key_with_hdr(keyslot, passphrase, passphrase_size,
+					   &cd->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)
@@ -1157,11 +1497,12 @@ 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)
+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;
@@ -1176,7 +1517,7 @@ int crypt_resume_by_keyfile(struct crypt_device *cd,
 		goto out;
 	}
 
-	r = dm_status_suspended(name);
+	r = dm_status_suspended(cd, name);
 	if (r < 0)
 		return r;
 
@@ -1189,17 +1530,18 @@ int crypt_resume_by_keyfile(struct crypt_device *cd,
 		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(mdata_device(cd), keyslot, passphrase_read,
+	r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
 				   passphrase_size_read, &cd->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:
@@ -1208,6 +1550,16 @@ 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
@@ -1245,7 +1597,7 @@ int crypt_keyslot_add_by_passphrase(struct crypt_device *cd,
 		}
 	} else if (passphrase) {
 		/* Passphrase provided, use it to unlock existing keyslot */
-		r = LUKS_open_key_with_hdr(mdata_device(cd), CRYPT_ANY_SLOT, passphrase,
+		r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, passphrase,
 					   passphrase_size, &cd->hdr, &vk, cd);
 	} else {
 		/* Passphrase not provided, ask first and use it to unlock existing keyslot */
@@ -1254,7 +1606,7 @@ int crypt_keyslot_add_by_passphrase(struct crypt_device *cd,
 		if (r < 0)
 			goto out;
 
-		r = LUKS_open_key_with_hdr(mdata_device(cd), CRYPT_ANY_SLOT, password,
+		r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, password,
 					   passwordLen, &cd->hdr, &vk, cd);
 		crypt_safe_free(password);
 	}
@@ -1272,7 +1624,7 @@ int crypt_keyslot_add_by_passphrase(struct crypt_device *cd,
 			goto out;
 	}
 
-	r = LUKS_set_key(mdata_device(cd), keyslot, new_password, new_passwordLen,
+	r = LUKS_set_key(keyslot, new_password, new_passwordLen,
 			 &cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
 	if(r < 0) goto out;
 
@@ -1284,12 +1636,14 @@ out:
 	return r ?: keyslot;
 }
 
-int crypt_keyslot_add_by_keyfile(struct crypt_device *cd,
+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; size_t passwordLen;
@@ -1322,14 +1676,14 @@ int crypt_keyslot_add_by_keyfile(struct crypt_device *cd,
 		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(mdata_device(cd), CRYPT_ANY_SLOT, password, passwordLen,
+		r = LUKS_open_key_with_hdr(CRYPT_ANY_SLOT, password, passwordLen,
 					   &cd->hdr, &vk, cd);
 	}
 
@@ -1339,14 +1693,14 @@ int crypt_keyslot_add_by_keyfile(struct crypt_device *cd,
 	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(mdata_device(cd), keyslot, new_password, new_passwordLen,
+	r = LUKS_set_key(keyslot, new_password, new_passwordLen,
 			 &cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
 out:
 	crypt_safe_free(password);
@@ -1355,6 +1709,18 @@ out:
 	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,
@@ -1400,7 +1766,7 @@ int crypt_keyslot_add_by_volume_key(struct crypt_device *cd,
 		passphrase_size = new_passwordLen;
 	}
 
-	r = LUKS_set_key(mdata_device(cd), keyslot, passphrase, passphrase_size,
+	r = LUKS_set_key(keyslot, passphrase, passphrase_size,
 			 &cd->hdr, vk, cd->iteration_time, &cd->PBKDF2_per_sec, cd);
 out:
 	crypt_safe_free(new_password);
@@ -1430,7 +1796,7 @@ int crypt_keyslot_destroy(struct crypt_device *cd, int keyslot)
 		return -EINVAL;
 	}
 
-	return LUKS_del_key(mdata_device(cd), keyslot, &cd->hdr, cd);
+	return LUKS_del_key(keyslot, &cd->hdr, cd);
 }
 
 // activation/deactivation of device mapping
@@ -1476,7 +1842,7 @@ int crypt_activate_by_passphrase(struct crypt_device *cd,
 		}
 
 		r = process_key(cd, cd->plain_hdr.hash,
-				cd->volume_key->keylength,
+				cd->plain_key_size,
 				passphrase, passphrase_size, &vk);
 		if (r < 0)
 			goto out;
@@ -1486,7 +1852,7 @@ int crypt_activate_by_passphrase(struct crypt_device *cd,
 	} else if (isLUKS(cd->type)) {
 		/* provided passphrase, do not retry */
 		if (passphrase) {
-			r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase,
+			r = LUKS_open_key_with_hdr(keyslot, passphrase,
 						   passphrase_size, &cd->hdr, &vk, cd);
 		} else
 			r = volume_key_by_terminal_passphrase(cd, keyslot, &vk);
@@ -1505,11 +1871,12 @@ out:
 	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;
@@ -1541,12 +1908,12 @@ int crypt_activate_by_keyfile(struct crypt_device *cd,
 
 		r = key_from_file(cd, _("Enter passphrase: "),
 				  &passphrase_read, &passphrase_size_read,
-				  keyfile, keyfile_size);
+				  keyfile, keyfile_offset, keyfile_size);
 		if (r < 0)
 			goto out;
 
 		r = process_key(cd, cd->plain_hdr.hash,
-				cd->volume_key->keylength,
+				cd->plain_key_size,
 				passphrase_read, passphrase_size_read, &vk);
 		if (r < 0)
 			goto out;
@@ -1554,10 +1921,10 @@ int crypt_activate_by_keyfile(struct crypt_device *cd,
 		r = PLAIN_activate(cd, name, vk, cd->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(mdata_device(cd), keyslot, passphrase_read,
+		r = LUKS_open_key_with_hdr(keyslot, passphrase_read,
 					   passphrase_size_read, &cd->hdr, &vk, cd);
 		if (r < 0)
 			goto out;
@@ -1571,7 +1938,7 @@ int crypt_activate_by_keyfile(struct crypt_device *cd,
 		r = keyslot;
 	} else if (isLOOPAES(cd->type)) {
 		r = key_from_file(cd, NULL, &passphrase_read, &passphrase_size_read,
-				  keyfile, keyfile_size);
+				  keyfile, keyfile_offset, keyfile_size);
 		if (r < 0)
 			goto out;
 		r = LOOPAES_parse_keyfile(cd, &vk, cd->loopaes_hdr.hash, &key_count,
@@ -1591,6 +1958,17 @@ out:
 	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,
@@ -1601,7 +1979,7 @@ int crypt_activate_by_volume_key(struct crypt_device *cd,
 	struct volume_key *vk = NULL;
 	int r = -EINVAL;
 
-	log_dbg("Activating volume %s by volume key.", name);
+	log_dbg("Activating volume %s by volume key.", name ?: "[none]");
 
 	if (name) {
 		ci = crypt_status(NULL, name);
@@ -1618,8 +1996,7 @@ int crypt_activate_by_volume_key(struct crypt_device *cd,
 		if (!name)
 			return -EINVAL;
 
-		if (!volume_key || !volume_key_size || !cd->volume_key ||
-			volume_key_size != cd->volume_key->keylength) {
+		if (!volume_key || !volume_key_size || volume_key_size != cd->plain_key_size) {
 			log_err(cd, _("Incorrect volume key specified for plain device.\n"));
 			return -EINVAL;
 		}
@@ -1650,6 +2027,31 @@ int crypt_activate_by_volume_key(struct crypt_device *cd,
 
 		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->verity_hdr, CRYPT_ACTIVATE_READONLY);
+
+		if (r == -EPERM) {
+			free(cd->verity_root_hash);
+			cd->verity_root_hash = NULL;
+		} if (!r) {
+			cd->verity_root_hash_size = volume_key_size;
+			if (!cd->verity_root_hash)
+				cd->verity_root_hash = malloc(volume_key_size);
+			if (cd->verity_root_hash)
+				memcpy(cd->verity_root_hash, volume_key, volume_key_size);
+		}
+	} else if (isTCRYPT(cd->type)) {
+		if (!name)
+			return -EINVAL;
+		r = TCRYPT_activate(cd, name, &cd->tcrypt_hdr,
+				    &cd->tcrypt_params, flags);
 	} else
 		log_err(cd, _("Device type is not properly initialised.\n"));
 
@@ -1667,16 +2069,13 @@ int crypt_deactivate(struct crypt_device *cd, const char *name)
 
 	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;
+			r = dm_remove_device(cd, name, 0, 0);
 			break;
 		case CRYPT_INACTIVE:
 			log_err(cd, _("Device %s is not active.\n"), name);
@@ -1688,7 +2087,7 @@ int crypt_deactivate(struct crypt_device *cd, const char *name)
 	}
 
 	if (!cd)
-		dm_exit();
+		dm_backend_exit();
 
 	return r;
 }
@@ -1704,6 +2103,11 @@ int crypt_volume_key_get(struct crypt_device *cd,
 	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) {
 		log_err(cd, _("Volume key buffer too small.\n"));
@@ -1716,7 +2120,7 @@ int crypt_volume_key_get(struct crypt_device *cd,
 		if (r < 0)
 			log_err(cd, _("Cannot retrieve volume key for plain device.\n"));
 	} else if (isLUKS(cd->type)) {
-		r = LUKS_open_key_with_hdr(mdata_device(cd), keyslot, passphrase,
+		r = LUKS_open_key_with_hdr(keyslot, passphrase,
 					passphrase_size, &cd->hdr, &vk, cd);
 
 	} else
@@ -1769,11 +2173,15 @@ void crypt_set_password_retry(struct crypt_device *cd, int tries)
 	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)
 {
@@ -1809,13 +2217,13 @@ crypt_status_info crypt_status(struct crypt_device *cd, const char *name)
 {
 	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;
@@ -1829,22 +2237,18 @@ crypt_status_info crypt_status(struct crypt_device *cd, const char *name)
 	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", mdata_device(cd));
+	log_std(cd, "LUKS header information for %s\n\n", mdata_device_path(cd));
 	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);
@@ -1852,12 +2256,12 @@ int crypt_dump(struct crypt_device *cd)
 	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, "MK digest:     \t");
-	hexprintICB(cd, cd->hdr.mkDigest, LUKS_DIGESTSIZE);
+	hexprint(cd, cd->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->hdr.mkDigestSalt, LUKS_SALTSIZE/2, " ");
 	log_std(cd, "\n               \t");
-	hexprintICB(cd, cd->hdr.mkDigestSalt+LUKS_SALTSIZE/2, LUKS_SALTSIZE/2);
+	hexprint(cd, cd->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);
@@ -1867,11 +2271,11 @@ int crypt_dump(struct crypt_device *cd)
 			log_std(cd, "\tIterations:         \t%d\n",
 				cd->hdr.keyblock[i].passwordIterations);
 			log_std(cd, "\tSalt:               \t");
-			hexprintICB(cd, cd->hdr.keyblock[i].passwordSalt,
-				    LUKS_SALTSIZE/2);
+			hexprint(cd, cd->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->hdr.keyblock[i].passwordSalt +
+				 LUKS_SALTSIZE/2, LUKS_SALTSIZE/2, " ");
 			log_std(cd, "\n");
 
 			log_std(cd, "\tKey material offset:\t%d\n",
@@ -1882,10 +2286,43 @@ int crypt_dump(struct crypt_device *cd)
 		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->verity_uuid ?: "");
+	log_std(cd, "Hash type:       \t%u\n", cd->verity_hdr.hash_type);
+	log_std(cd, "Data blocks:     \t%" PRIu64 "\n", cd->verity_hdr.data_size);
+	log_std(cd, "Data block size: \t%u\n", cd->verity_hdr.data_block_size);
+	log_std(cd, "Hash block size: \t%u\n", cd->verity_hdr.hash_block_size);
+	log_std(cd, "Hash algorithm:  \t%s\n", cd->verity_hdr.hash_name);
+	log_std(cd, "Salt:            \t");
+	if (cd->verity_hdr.salt_size)
+		hexprint(cd, cd->verity_hdr.salt, cd->verity_hdr.salt_size, "");
+	else
+		log_std(cd, "-");
+	log_std(cd, "\n");
+	if (cd->verity_root_hash) {
+		log_std(cd, "Root hash:      \t");
+		hexprint(cd, cd->verity_root_hash, cd->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);
+
+	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))
@@ -1925,19 +2362,26 @@ const char *crypt_get_uuid(struct crypt_device *cd)
 	if (isLOOPAES(cd->type))
 		return cd->loopaes_uuid;
 
+	if (isVERITY(cd->type))
+		return cd->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->plain_key_size;
 
 	if (isLUKS(cd->type))
 		return cd->hdr.keyBytes;
@@ -1945,6 +2389,9 @@ int crypt_get_volume_key_size(struct crypt_device *cd)
 	if (isLOOPAES(cd->type))
 		return cd->loopaes_key_size;
 
+	if (isVERITY(cd->type))
+		return cd->verity_root_hash_size;
+
 	return 0;
 }
 
@@ -1959,6 +2406,12 @@ uint64_t crypt_get_data_offset(struct crypt_device *cd)
 	if (isLOOPAES(cd->type))
 		return cd->loopaes_hdr.offset;
 
+	if (isTCRYPT(cd->type)) { // FIXME: system vol.
+		if (!cd->tcrypt_hdr.d.mk_offset)
+			return 1;
+		return (cd->tcrypt_hdr.d.mk_offset / cd->tcrypt_hdr.d.sector_size);
+	}
+
 	return 0;
 }
 
@@ -1973,6 +2426,12 @@ uint64_t crypt_get_iv_offset(struct crypt_device *cd)
 	if (isLOOPAES(cd->type))
 		return cd->loopaes_hdr.skip;
 
+	if (isTCRYPT(cd->type)) {
+		if (!cd->tcrypt_hdr.d.mk_offset)
+			return 0;
+		return (cd->tcrypt_hdr.d.mk_offset / cd->tcrypt_hdr.d.sector_size);
+	}
+
 	return 0;
 }
 
@@ -1994,11 +2453,42 @@ 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->hdr, keyslot, offset, length);
+}
+
 const char *crypt_get_type(struct crypt_device *cd)
 {
 	return cd->type;
 }
 
+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->verity_hdr.hash_name;
+	vp->salt = cd->verity_hdr.salt;
+	vp->salt_size = cd->verity_hdr.salt_size;
+	vp->data_block_size = cd->verity_hdr.data_block_size;
+	vp->hash_block_size = cd->verity_hdr.hash_block_size;
+	vp->data_size = cd->verity_hdr.data_size;
+	vp->hash_area_offset = cd->verity_hdr.hash_area_offset;
+	vp->hash_type = cd->verity_hdr.hash_type;
+	vp->flags = cd->verity_hdr.flags & CRYPT_VERITY_NO_HEADER;
+	return 0;
+}
+
 int crypt_get_active_device(struct crypt_device *cd __attribute__((unused)),
 			    const char *name,
 			    struct crypt_active_device *cad)
@@ -2006,12 +2496,15 @@ int crypt_get_active_device(struct crypt_device *cd __attribute__((unused)),
 	struct crypt_dm_active_device dmd;
 	int r;
 
-	r = dm_query_device(name, 0, &dmd);
+	r = dm_query_device(cd, name, 0, &dmd);
 	if (r < 0)
 		return r;
 
-	cad->offset	= dmd.offset;
-	cad->iv_offset	= dmd.iv_offset;
+	if (dmd.target != DM_CRYPT && dmd.target != DM_VERITY)
+		return -ENOTSUP;
+
+	cad->offset	= dmd.u.crypt.offset;
+	cad->iv_offset	= dmd.u.crypt.iv_offset;
 	cad->size	= dmd.size;
 	cad->flags	= dmd.flags;