* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <string.h>
-#include <ctype.h>
-#include <inttypes.h>
-#include <popt.h>
-#include <limits.h>
-#include <sys/stat.h>
-
#include "cryptsetup.h"
#define PACKAGE_VERITY "veritysetup"
static uint64_t hash_offset = 0;
static const char *opt_uuid = NULL;
-static int opt_verbose = 0;
-static int opt_debug = 0;
static int opt_version_mode = 0;
static const char **action_argv;
static int action_argc;
-static size_t hex_to_bytes(const char *hex, char *result)
-{
- char buf[3] = "xx\0", *endp;
- size_t i, len;
-
- 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])
- return -EINVAL;
- }
- return i;
-}
-
-__attribute__((format(printf, 5, 6)))
-static void clogger(struct crypt_device *cd, int level, const char *file,
- int line, const char *format, ...)
-{
- va_list argp;
- char *target = NULL;
-
- va_start(argp, format);
-
- if (vasprintf(&target, format, argp) > 0) {
- if (level >= 0) {
- crypt_log(cd, level, target);
-#ifdef CRYPT_DEBUG
- } else if (opt_debug)
- printf("# %s:%d %s\n", file ?: "?", line, target);
-#else
- } else if (opt_debug)
- printf("# %s\n", target);
-#endif
- }
-
- va_end(argp);
- free(target);
-}
-
-static void _log(int level, const char *msg, void *usrptr __attribute__((unused)))
-{
- switch(level) {
-
- case CRYPT_LOG_NORMAL:
- fputs(msg, stdout);
- break;
- case CRYPT_LOG_VERBOSE:
- if (opt_verbose)
- fputs(msg, stdout);
- break;
- case CRYPT_LOG_ERROR:
- fputs(msg, stderr);
- break;
- case CRYPT_LOG_DEBUG:
- if (opt_debug)
- printf("# %s\n", msg);
- break;
- default:
- fprintf(stderr, "Internal error on logging class for msg: %s", msg);
- break;
- }
-}
-
static int _prepare_format(struct crypt_params_verity *params,
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) {
- if (hex_to_bytes(salt_string, salt_bytes) * 2 != strlen(salt_string)) {
+ len = crypt_hex_to_bytes(salt_string, &salt, 0);
+ if (len < 0) {
log_err(_("Invalid salt string specified.\n"));
return -EINVAL;
}
- params->salt_size = strlen(salt_string) / 2;
- 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;
struct crypt_device *cd = NULL;
struct crypt_params_verity params = {};
uint32_t flags = CRYPT_VERITY_CREATE_HASH;
+ struct stat st;
int r;
+ /* Try to create hash image if doesn't exist */
+ if (stat(action_argv[1], &st) < 0) {
+ log_dbg("Creating hash image %s.", action_argv[1]);
+ r = open(action_argv[1], O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ if (r < 0) {
+ log_err(_("Cannot create hash image %s for writing.\n"), action_argv[1]);
+ return -EINVAL;
+ }
+ close(r);
+ }
+
if ((r = crypt_init(&cd, action_argv[1])))
goto out;
crypt_dump(cd);
out:
crypt_free(cd);
+ free(CONST_CAST(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];
- size_t hash_size;
+ char *root_hash_bytes = NULL;
+ ssize_t hash_size;
int r;
if ((r = crypt_init(&cd, hash_device)))
goto out;
hash_size = crypt_get_volume_key_size(cd);
- if (hash_size * 2 != strlen(root_hash) ||
- hex_to_bytes(root_hash, root_hash_bytes) != hash_size) {
+ if (crypt_hex_to_bytes(root_hash, &root_hash_bytes, 0) != hash_size) {
log_err(_("Invalid root hash string specified.\n"));
r = -EINVAL;
goto out;
activate_flags);
out:
crypt_free(cd);
+ free(root_hash_bytes);
+ free(CONST_CAST(char*)params.salt);
return r;
}
return r;
}
-static __attribute__ ((noreturn)) void usage(poptContext popt_context,
- int exitcode, const char *error,
- const char *more)
-{
- poptPrintUsage(popt_context, stderr, 0);
- if (error)
- log_err("%s: %s\n", more, error);
- poptFreeContext(popt_context);
- exit(exitcode);
-}
-
-static void _dbg_version_and_cmd(int argc, const char **argv)
-{
- int i;
-
- log_std("# %s %s processing \"", PACKAGE_VERITY, PACKAGE_VERSION);
- for (i = 0; i < argc; i++) {
- if (i)
- log_std(" ");
- log_std("%s", argv[i]);
- }
- log_std("\"\n");
-}
-
static struct action_type {
const char *type;
int (*handler)(int);
usage(popt_context, EXIT_SUCCESS, NULL, NULL);
}
-static void show_status(int errcode)
-{
- char error[256], *error_;
-
- if(!opt_verbose)
- return;
-
- if(!errcode) {
- log_std(_("Command successful.\n"));
- return;
- }
-
- crypt_get_error(error, sizeof(error));
-
- if (!error[0]) {
- error_ = strerror_r(-errcode, error, sizeof(error));
- if (error_ != error) {
- strncpy(error, error_, sizeof(error));
- error[sizeof(error) - 1] = '\0';
- }
- }
-
- log_err(_("Command failed with code %i"), -errcode);
- if (*error)
- log_err(": %s\n", error);
- else
- log_err(".\n");
-}
-
static int run_action(struct action_type *action)
{
int r;
r = action->handler(0);
show_status(r);
-
- /* Translate exit code to simple codes */
- switch (r) {
- case 0: r = EXIT_SUCCESS; break;
- case -EEXIST:
- case -EBUSY: r = 5; break;
- case -ENOTBLK:
- case -ENODEV: r = 4; break;
- case -ENOMEM: r = 3; break;
- case -EPERM: r = 2; break;
- case -EINVAL:
- case -ENOENT:
- case -ENOSYS:
- default: r = EXIT_FAILURE;
- }
- return r;
+ return translate_errno(r);
}
int main(int argc, const char **argv)
const char *aname;
int r;
- crypt_set_log_callback(NULL, _log, NULL);
+ crypt_set_log_callback(NULL, tool_log, NULL);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
popt_context = poptGetContext("verity", argc, argv, popt_options, 0);
poptSetOtherOptionHelp(popt_context,
- N_("[OPTION...] <action> <action-specific>"));
+ _("[OPTION...] <action> <action-specific>"));
while((r = poptGetNextOpt(popt_context)) > 0) {
unsigned long long ull_value;
if (opt_debug) {
opt_verbose = 1;
crypt_set_debug_level(-1);
- _dbg_version_and_cmd(argc, argv);
+ dbg_version_and_cmd(argc, argv);
}
r = run_action(action);