*
* Copyright (C) 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 file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This file 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser 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
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
static int mult_overflow(off_t *u, off_t b, size_t size)
{
*u = (uint64_t)b * size;
- if ((off_t)(*u / size) != b || (off_t)*u < 0 || (off_t)*u != *u)
+ if ((off_t)(*u / size) != b || (off_t)*u < 0)
return 1;
return 0;
}
int verify,
int version,
const char *hash_name,
- const char *hash_device,
- const char *data_device,
+ struct device *hash_device,
+ struct device *data_device,
size_t hash_block_size,
size_t data_block_size,
off_t data_blocks,
off_t hash_level_block[VERITY_MAX_LEVELS];
off_t hash_level_size[VERITY_MAX_LEVELS];
off_t data_file_blocks, s;
- size_t hash_per_block, hash_per_block_bits;
+ size_t hash_per_block_bits;
off_t data_device_size = 0, hash_device_size = 0;
uint64_t dev_size;
int levels, i, r;
log_dbg("Hash %s %s, data device %s, data blocks %" PRIu64
", hash_device %s, offset %" PRIu64 ".",
verify ? "verification" : "creation", hash_name,
- data_device, data_blocks, hash_device, hash_position);
+ device_path(data_device), data_blocks,
+ device_path(hash_device), hash_position);
if (data_blocks < 0 || hash_position < 0) {
log_err(cd, _("Invalid size parameters for verity device.\n"));
}
hash_per_block_bits = get_bits_down(hash_block_size / digest_size);
- hash_per_block = 1 << hash_per_block_bits;
if (!hash_per_block_bits)
return -EINVAL;
for (i = levels - 1; i >= 0; i--) {
hash_level_block[i] = hash_position;
// verity position of block data_file_blocks at level i
- s = data_file_blocks >> (i * hash_per_block_bits);
- s = (s + hash_per_block - 1) / hash_per_block;
+ s = (data_file_blocks + ((off_t)1 << ((i + 1) * hash_per_block_bits)) - 1) >> ((i + 1) * hash_per_block_bits);
hash_level_size[i] = s;
- if (hash_position + s < hash_position ||
- (hash_position + s) < 0 ||
- (hash_position + s) != hash_position + s) {
+ if ((hash_position + s) < hash_position ||
+ (hash_position + s) < 0) {
log_err(cd, _("Device offset overflow.\n"));
return -EINVAL;
}
log_dbg("Data device size required: %" PRIu64 " bytes.",
data_device_size);
- data_file = fopen(data_device, "r");
+ data_file = fopen(device_path(data_device), "r");
if (!data_file) {
- log_err(cd, _("Cannot open device %s.\n"), data_device);
+ log_err(cd, _("Cannot open device %s.\n"),
+ device_path(data_device)
+ );
r = -EIO;
goto out;
}
log_dbg("Hash device size required: %" PRIu64 " bytes.",
hash_device_size);
- hash_file = fopen(hash_device, verify ? "r" : "r+");
+ hash_file = fopen(device_path(hash_device), verify ? "r" : "r+");
if (!hash_file) {
- log_err(cd, _("Cannot open device %s.\n"), hash_device);
+ log_err(cd, _("Cannot open device %s.\n"),
+ device_path(hash_device));
r = -EIO;
goto out;
}
if (r)
goto out;
} else {
- hash_file_2 = fopen(hash_device, "r");
+ hash_file_2 = fopen(device_path(hash_device), "r");
if (!hash_file_2) {
- log_err(cd, _("Cannot open device %s.\n"), hash_device);
+ log_err(cd, _("Cannot open device %s.\n"),
+ device_path(hash_device));
r = -EIO;
goto out;
}
/* Verify verity device using userspace crypto backend */
int VERITY_verify(struct crypt_device *cd,
struct crypt_params_verity *verity_hdr,
- const char *data_device,
- const char *hash_device,
const char *root_hash,
size_t root_hash_size)
{
return VERITY_create_or_verify_hash(cd, 1,
verity_hdr->hash_type,
verity_hdr->hash_name,
- hash_device,
- data_device,
+ crypt_metadata_device(cd),
+ crypt_data_device(cd),
verity_hdr->hash_block_size,
verity_hdr->data_block_size,
verity_hdr->data_size,
/* Create verity hash */
int VERITY_create(struct crypt_device *cd,
struct crypt_params_verity *verity_hdr,
- const char *data_device,
- const char *hash_device,
char *root_hash,
size_t root_hash_size)
{
return VERITY_create_or_verify_hash(cd, 0,
verity_hdr->hash_type,
verity_hdr->hash_name,
- hash_device,
- data_device,
+ crypt_metadata_device(cd),
+ crypt_data_device(cd),
verity_hdr->hash_block_size,
verity_hdr->data_block_size,
verity_hdr->data_size,
projects / platform / upstream / cryptsetup.git / blobdiff