X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fveritysetup.c;h=8f45be4c18eecc65be19db84124f8da1ffe62a92;hb=a3777a6b2cde2c7133141474dd4c428220a3e9cc;hp=3b1991d91ba476bbec27aa4a9a4bf96282336290;hpb=d380da7a3264b32741c583d0455945fae43a65d8;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/src/veritysetup.c b/src/veritysetup.c index 3b1991d..8f45be4 100644 --- a/src/veritysetup.c +++ b/src/veritysetup.c @@ -1,11 +1,13 @@ /* * veritysetup - setup cryptographic volumes for dm-verity * - * Copyright (C) 2012, Red Hat, Inc. All rights reserved. + * Copyright (C) 2012-2013, Red Hat, Inc. All rights reserved. + * Copyright (C) 2012-2013, Milan Broz * * 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. + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,17 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "cryptsetup.h" #define PACKAGE_VERITY "veritysetup" @@ -43,82 +34,17 @@ static const char *salt_string = NULL; 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; @@ -127,14 +53,17 @@ static int _prepare_format(struct crypt_params_verity *params, 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; @@ -153,6 +82,16 @@ static int action_format(int arg) uint32_t flags = CRYPT_VERITY_CREATE_HASH; int r; + /* Try to create hash image if doesn't exist */ + r = open(action_argv[1], O_WRONLY | O_EXCL | O_CREAT, S_IRUSR | S_IWUSR); + if (r < 0 && errno != EEXIST) { + log_err(_("Cannot create hash image %s for writing.\n"), action_argv[1]); + return -EINVAL; + } else if (r >= 0) { + log_dbg("Created hash image %s.", action_argv[1]); + close(r); + } + if ((r = crypt_init(&cd, action_argv[1]))) goto out; @@ -168,6 +107,7 @@ static int action_format(int arg) crypt_dump(cd); out: crypt_free(cd); + free(CONST_CAST(char*)params.salt); return r; } @@ -180,8 +120,8 @@ static int _activate(const char *dm_device, 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))) @@ -204,8 +144,7 @@ static int _activate(const char *dm_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; @@ -216,6 +155,8 @@ static int _activate(const char *dm_device, activate_flags); out: crypt_free(cd); + free(root_hash_bytes); + free(CONST_CAST(char*)params.salt); return r; } @@ -357,30 +298,6 @@ static int action_dump(int arg) 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); @@ -430,35 +347,6 @@ static void help(poptContext popt_context, 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; @@ -468,22 +356,7 @@ static int run_action(struct action_type *action) 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) @@ -518,7 +391,7 @@ 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); @@ -526,7 +399,7 @@ int main(int argc, const char **argv) popt_context = poptGetContext("verity", argc, argv, popt_options, 0); poptSetOtherOptionHelp(popt_context, - N_("[OPTION...] ")); + _("[OPTION...] ")); while((r = poptGetNextOpt(popt_context)) > 0) { unsigned long long ull_value; @@ -598,7 +471,7 @@ int main(int argc, const char **argv) 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);