#include "libcryptsetup.h"
#include "luks.h"
#include "loopaes.h"
+#include "verity.h"
#include "internal.h"
-#include "crypto_backend.h"
struct crypt_device {
char *type;
char *loopaes_uuid;
unsigned int loopaes_key_size;
+ /* used in CRYPT_VERITY */
+ struct crypt_params_verity verity_hdr;
+ char *verity_root_hash;
+ uint64_t verity_root_hash_size;
+ char *verity_uuid;
+
/* callbacks definitions */
void (*log)(int level, const char *msg, void *usrptr);
void *log_usrptr;
{
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;
}
return (type && !strcmp(CRYPT_LOOPAES, type));
}
+static int isVERITY(const char *type)
+{
+ return (type && !strcmp(CRYPT_VERITY, type));
+}
+
/* keyslot helpers */
static int keyslot_verify_or_find_empty(struct crypt_device *cd, int *keyslot)
{
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_get_device_name(cd),
+ .u.crypt = {
+ .cipher = NULL,
+ .vk = vk,
+ .offset = crypt_get_data_offset(cd),
+ .iv_offset = crypt_get_iv_offset(cd),
+ }
};
if (dmd.flags & CRYPT_ACTIVATE_SHARED)
else
device_check = DEV_EXCL;
- r = device_check_and_adjust(cd, dmd.device, device_check,
- &dmd.size, &dmd.offset, &flags);
+ r = device_check_and_adjust(cd, dmd.data_device, device_check,
+ &dmd.size, &dmd.u.crypt.offset, &dmd.flags);
if (r)
return r;
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);
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);
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->flags & CRYPT_VERITY_NO_HEADER)
+ return -EINVAL;
+
+ if (params)
+ sb_offset = params->hash_area_offset;
+
+ r = VERITY_read_sb(cd, mdata_device(cd), sb_offset,
+ &cd->verity_uuid, &cd->verity_hdr);
+ if (r < 0)
+ return r;
+
+ if (params)
+ cd->verity_hdr.flags = params->flags;
+
+ if (params && params->data_device &&
+ (r = crypt_set_data_device(cd, params->data_device)) < 0)
+ return r;
+
+ cd->verity_root_hash_size = crypt_hash_size(cd->verity_hdr.hash_name);
+
+ if (!cd->type && !(cd->type = strdup(CRYPT_VERITY)))
+ return -ENOMEM;
+
+ 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(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 (mdata_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);
+ free(CONST_CAST(void*)dmd.u.crypt.cipher);
+ free(CONST_CAST(void*)dmd.data_device);
+ 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 = ¶ms,
+ };
+ int r;
+
+ r = dm_query_device(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;
+ if (!(cd->metadata_device = strdup(dmd.u.verity.hash_device)))
+ r = -ENOMEM;
+ }
+out:
+ free(CONST_CAST(void*)dmd.u.verity.hash_device);
+ free(CONST_CAST(void*)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);
return -ENODEV;
}
- r = dm_query_device(name, DM_ACTIVE_DEVICE | DM_ACTIVE_CIPHER |
- DM_ACTIVE_UUID | DM_ACTIVE_KEYSIZE, &dmd);
+ r = dm_query_device(name, DM_ACTIVE_DEVICE | DM_ACTIVE_UUID, &dmd);
if (r < 0)
goto out;
if (header_device) {
r = crypt_init(cd, header_device);
} else {
- r = crypt_init(cd, dmd.device);
+ r = crypt_init(cd, 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;
+ free(CONST_CAST(void*)dmd.data_device);
+ dmd.data_device = NULL;
r = crypt_init(cd, NULL);
}
}
(*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, 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))) {
+ if (!(*cd)->backing_file && dmd.data_device &&
+ crypt_loop_device(dmd.data_device) &&
+ !((*cd)->backing_file = crypt_loop_backing_file(dmd.data_device))) {
r = -ENOMEM;
goto out;
}
- if (isPLAIN((*cd)->type)) {
- (*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;
- (*cd)->plain_key_size = dmd.vk->keylength;
-
- 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)->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_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;
- }
- /* 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);
+ free(CONST_CAST(void*)dmd.data_device);
free(CONST_CAST(void*)dmd.uuid);
return r;
}
return 0;
}
+static int _crypt_format_verity(struct crypt_device *cd,
+ const char *uuid,
+ struct crypt_params_verity *params)
+{
+ int r = 0;
+ uint64_t data_device_size;
+
+ if (!mdata_device(cd)) {
+ log_err(cd, _("Can't format VERITY without device.\n"));
+ return -EINVAL;
+ }
+
+ if (!params || !params->data_device)
+ return -EINVAL;
+
+ /* set data device */
+ cd->type = CRYPT_VERITY;
+ r = crypt_set_data_device(cd, params->data_device);
+ cd->type = NULL;
+ if (r)
+ return r;
+ if (!params->data_size) {
+ r = device_size(params->data_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;
+
+ cd->verity_root_hash_size = crypt_hash_size(params->hash_name);
+ if (!cd->verity_root_hash_size)
+ return -EINVAL;
+
+ cd->verity_root_hash = malloc(cd->verity_root_hash_size);
+ if (!cd->verity_root_hash)
+ return -ENOMEM;
+
+ cd->verity_hdr.flags = params->flags;
+ cd->verity_hdr.hash_name = strdup(params->hash_name);
+ 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;
+ cd->verity_hdr.salt = malloc(params->salt_size);
+ 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->device, mdata_device(cd),
+ 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, mdata_device(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,
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);
int crypt_load(struct crypt_device *cd,
const char *requested_type,
- void *params __attribute__((unused)))
+ void *params)
{
int r;
if (!mdata_device(cd))
return -EINVAL;
- if (requested_type && !isLUKS(requested_type))
- 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;
+ }
- if (cd->type && !isLUKS(cd->type)) {
- log_dbg("Context is already initialised to type %s", cd->type);
+ 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
return -EINVAL;
- }
- r = _crypt_load_luks1(cd, 1, 0);
if (r < 0)
return r;
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(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_check_and_adjust(cd, dmd.data_device, DEV_OK, &new_size,
+ &dmd.u.crypt.offset, &dmd.flags);
if (r)
goto out;
r = dm_create_device(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;
if (requested_type && !isLUKS(requested_type))
return -EINVAL;
- /* Some hash functions need initialized gcrypt library */
r = init_crypto(cd);
if (r < 0)
return r;
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);
}
}
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);
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, mdata_device(cd),
+ 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
log_err(cd, _("Device type is not properly initialised.\n"));
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, "Version: \t%d\n", cd->hdr.version);
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);
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",
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(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))
if (isLOOPAES(cd->type))
return cd->loopaes_uuid;
+ if (isVERITY(cd->type))
+ return cd->verity_uuid;
+
return NULL;
}
return cd->device;
}
-
int crypt_get_volume_key_size(struct crypt_device *cd)
{
if (isPLAIN(cd->type))
if (isLOOPAES(cd->type))
return cd->loopaes_key_size;
+ if (isVERITY(cd->type))
+ return cd->verity_root_hash_size;
+
return 0;
}
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 = cd->device;
+ vp->hash_device = mdata_device(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)
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;
projects / platform / upstream / cryptsetup.git / blobdiff