#include <stdarg.h>
#include <errno.h>
#include <string.h>
+#include <ctype.h>
#include <inttypes.h>
#include <popt.h>
#include <limits.h>
#define PACKAGE_VERITY "veritysetup"
-static int use_superblock = 1; /* FIXME: no superblock not supported */
+static int use_superblock = 1;
static const char *hash_algorithm = NULL;
static int hash_type = 1;
static int hash_block_size = DEFAULT_VERITY_HASH_BLOCK;
static uint64_t data_blocks = 0;
static const char *salt_string = NULL;
-static uint64_t hash_start = 0;
+static uint64_t hash_offset = 0;
static const char *opt_uuid = NULL;
static int opt_verbose = 0;
static const char **action_argv;
static int action_argc;
-static int hex_to_bytes(const char *hex, char *result)
+static size_t hex_to_bytes(const char *hex, char **result)
{
- char buf[3] = "xx\0", *endp;
- int i, len;
+ char buf[3] = "xx\0", *endp, *bytes;
+ size_t i, len;
+
+ len = strlen(hex);
+ if (len % 2)
+ return -EINVAL;
+ len /= 2;
+
+ if (!(bytes = malloc(len)))
+ return -ENOMEM;
- len = strlen(hex) / 2;
for (i = 0; i < len; i++) {
memcpy(buf, &hex[i * 2], 2);
- result[i] = strtoul(buf, &endp, 16);
- if (endp != &buf[2])
+ bytes[i] = strtoul(buf, &endp, 16);
+ if (endp != &buf[2]) {
+ free(bytes);
return -EINVAL;
+ }
}
+ *result = bytes;
return i;
}
const char *data_device,
uint32_t flags)
{
- static char salt_bytes[512];
+ char *salt = NULL;
+ int len;
params->hash_name = hash_algorithm ?: DEFAULT_VERITY_HASH;
params->data_device = data_device;
params->salt_size = 0;
params->salt = NULL;
} else if (salt_string) {
- params->salt_size = strlen(salt_string) / 2;
- if (hex_to_bytes(salt_string, salt_bytes) != params->salt_size)
+ len = hex_to_bytes(salt_string, &salt);
+ if (len < 0) {
+ log_err(_("Invalid salt string specified.\n"));
return -EINVAL;
- params->salt = salt_bytes;
- } else
+ }
+ params->salt_size = len;
+ params->salt = salt;
+ } else {
params->salt_size = DEFAULT_VERITY_SALT_SIZE;
+ params->salt = NULL;
+ }
params->data_block_size = data_block_size;
params->hash_block_size = hash_block_size;
params->data_size = data_blocks;
- params->hash_area_offset = hash_start;
+ params->hash_area_offset = hash_offset;
params->hash_type = hash_type;
params->flags = flags;
crypt_dump(cd);
out:
crypt_free(cd);
+ free((char*)params.salt);
return r;
}
struct crypt_device *cd = NULL;
struct crypt_params_verity params = {};
uint32_t activate_flags = CRYPT_ACTIVATE_READONLY;
- char root_hash_bytes[128];
+ char *root_hash_bytes = NULL;
+ size_t hash_size;
int r;
if ((r = crypt_init(&cd, hash_device)))
if (use_superblock) {
params.flags = flags;
- params.hash_area_offset = hash_start;
+ params.hash_area_offset = hash_offset;
r = crypt_load(cd, CRYPT_VERITY, ¶ms);
} else {
r = _prepare_format(¶ms, data_device, flags | CRYPT_VERITY_NO_HEADER);
if (r < 0)
goto out;
- if (hex_to_bytes(root_hash, root_hash_bytes) !=
- crypt_get_volume_key_size(cd)) {
+ hash_size = crypt_get_volume_key_size(cd);
+ if (hex_to_bytes(root_hash, &root_hash_bytes) != hash_size) {
+ log_err(_("Invalid root hash string specified.\n"));
r = -EINVAL;
goto out;
}
r = crypt_activate_by_volume_key(cd, dm_device,
root_hash_bytes,
- crypt_get_volume_key_size(cd),
+ hash_size,
activate_flags);
out:
crypt_free(cd);
+ free(root_hash_bytes);
+ free((char*)params.salt);
return r;
}
struct crypt_device *cd = NULL;
struct stat st;
char *backing_file;
- int i, path = 0, r = 0;
+ unsigned i, path = 0;
+ int r = 0;
/* perhaps a path, not a dm device name */
if (strchr(action_argv[0], '/') && !stat(action_argv[0], &st))
if ((r = crypt_init(&cd, action_argv[0])))
return r;
- params.hash_area_offset = hash_start;
+ params.hash_area_offset = hash_offset;
r = crypt_load(cd, CRYPT_VERITY, ¶ms);
if (!r)
crypt_dump(cd);
int main(int argc, const char **argv)
{
static char *popt_tmp;
+ static const char *null_action_argv[] = {NULL};
static struct poptOption popt_help_options[] = {
{ NULL, '\0', POPT_ARG_CALLBACK, help, 0, NULL, NULL },
{ "help", '?', POPT_ARG_NONE, NULL, 0, N_("Show this help message"), NULL },
{ "data-block-size", 0, POPT_ARG_INT, &data_block_size, 0, N_("Block size on the data device"), N_("bytes") },
{ "hash-block-size", 0, POPT_ARG_INT, &hash_block_size, 0, N_("Block size on the hash device"), N_("bytes") },
{ "data-blocks", 0, POPT_ARG_STRING, &popt_tmp, 1, N_("The number of blocks in the data file"), N_("blocks") },
- { "hash-start", 0, POPT_ARG_STRING, &popt_tmp, 2, N_("Starting block on the hash device"), N_("512-byte sectors") },
+ { "hash-offset", 0, POPT_ARG_STRING, &popt_tmp, 2, N_("Starting offset on the hash device"), N_("bytes") },
{ "hash", 'h', POPT_ARG_STRING, &hash_algorithm, 0, N_("Hash algorithm"), N_("string") },
{ "salt", 's', POPT_ARG_STRING, &salt_string, 0, N_("Salt"), N_("hex string") },
{ "uuid", '\0', POPT_ARG_STRING, &opt_uuid, 0, N_("UUID for device to use."), NULL },
poptContext popt_context;
struct action_type *action;
- const char *aname, *null_action_argv[] = {NULL};
+ const char *aname;
int r;
crypt_set_log_callback(NULL, _log, NULL);
char *endp;
errno = 0;
- ull_value = strtoull(popt_tmp, &endp, 0);
- if (*endp || !*popt_tmp ||
+ ull_value = strtoull(popt_tmp, &endp, 10);
+ if (*endp || !*popt_tmp || !isdigit(*popt_tmp) ||
(errno == ERANGE && ull_value == ULLONG_MAX) ||
(errno != 0 && ull_value == 0))
r = POPT_ERROR_BADNUMBER;
data_blocks = ull_value;
break;
case 2:
- hash_start = ull_value * 512;
+ hash_offset = ull_value;
break;
}
poptGetInvocationName(popt_context));
}
+ if (data_block_size < 0 || hash_block_size < 0 || hash_type < 0) {
+ usage(popt_context, EXIT_FAILURE,
+ _("Negative number for option not permitted."),
+ poptGetInvocationName(popt_context));
+ }
+
if (opt_debug) {
opt_verbose = 1;
crypt_set_debug_level(-1);
projects / platform / upstream / cryptsetup.git / blobdiff