diff options
Diffstat (limited to 'common/rollback.c')
| -rw-r--r-- | common/rollback.c | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/common/rollback.c b/common/rollback.c index 984058c49a..7aaba72ebb 100644 --- a/common/rollback.c +++ b/common/rollback.c @@ -1,10 +1,11 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ /* Rollback protection logic. */ +#include "builtin/assert.h" #include "common.h" #include "console.h" #ifdef CONFIG_LIBCRYPTOC @@ -25,7 +26,7 @@ #include "util.h" /* Console output macros */ -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) +#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) /* Number of rollback regions */ #define ROLLBACK_REGIONS 2 @@ -188,12 +189,12 @@ failed: #ifdef CONFIG_ROLLBACK_UPDATE #ifdef CONFIG_ROLLBACK_SECRET_SIZE -static int add_entropy(uint8_t *dst, const uint8_t *src, - const uint8_t *add, unsigned int add_len) +static int add_entropy(uint8_t *dst, const uint8_t *src, const uint8_t *add, + unsigned int add_len) { int ret = 0; #ifdef CONFIG_SHA256 -BUILD_ASSERT(SHA256_DIGEST_SIZE == CONFIG_ROLLBACK_SECRET_SIZE); + BUILD_ASSERT(SHA256_DIGEST_SIZE == CONFIG_ROLLBACK_SECRET_SIZE); struct sha256_ctx ctx; uint8_t *hash; #ifdef CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE @@ -240,16 +241,16 @@ failed: * * @return EC_SUCCESS on success, EC_ERROR_* on error. */ -static int rollback_update(int32_t next_min_version, - const uint8_t *entropy, unsigned int length) +static int rollback_update(int32_t next_min_version, const uint8_t *entropy, + unsigned int length) { /* * When doing flash_write operation, the data needs to be in blocks * of CONFIG_FLASH_WRITE_SIZE, pad rollback_data as required. */ uint8_t block[CONFIG_FLASH_WRITE_SIZE * - DIV_ROUND_UP(sizeof(struct rollback_data), - CONFIG_FLASH_WRITE_SIZE)]; + DIV_ROUND_UP(sizeof(struct rollback_data), + CONFIG_FLASH_WRITE_SIZE)]; struct rollback_data *data = (struct rollback_data *)block; BUILD_ASSERT(sizeof(block) >= sizeof(*data)); int erase_size, offset, region, ret; @@ -260,7 +261,7 @@ static int rollback_update(int32_t next_min_version, } /* Initialize the rest of the block. */ - memset(&block[sizeof(*data)], 0xff, sizeof(block)-sizeof(*data)); + memset(&block[sizeof(*data)], 0xff, sizeof(block) - sizeof(*data)); region = get_latest_rollback(data); @@ -349,7 +350,7 @@ int rollback_add_entropy(const uint8_t *data, unsigned int len) return rollback_update(-1, data, len); } -static int command_rollback_update(int argc, char **argv) +static int command_rollback_update(int argc, const char **argv) { int32_t min_version; char *e; @@ -364,12 +365,11 @@ static int command_rollback_update(int argc, char **argv) return rollback_update_version(min_version); } -DECLARE_CONSOLE_COMMAND(rollbackupdate, command_rollback_update, - "min_version", +DECLARE_CONSOLE_COMMAND(rollbackupdate, command_rollback_update, "min_version", "Update rollback info"); #ifdef CONFIG_ROLLBACK_SECRET_SIZE -static int command_rollback_add_entropy(int argc, char **argv) +static int command_rollback_add_entropy(int argc, const char **argv) { int len; @@ -380,8 +380,7 @@ static int command_rollback_add_entropy(int argc, char **argv) return rollback_add_entropy(argv[1], len); } -DECLARE_CONSOLE_COMMAND(rollbackaddent, command_rollback_add_entropy, - "data", +DECLARE_CONSOLE_COMMAND(rollbackaddent, command_rollback_add_entropy, "data", "Add entropy to rollback block"); #ifdef CONFIG_RNG @@ -400,9 +399,9 @@ static void add_entropy_deferred(void) if (add_entropy_action == ADD_ENTROPY_RESET_ASYNC) repeat = ROLLBACK_REGIONS; - init_trng(); + trng_init(); do { - rand_bytes(rand, sizeof(rand)); + trng_rand_bytes(rand, sizeof(rand)); if (rollback_add_entropy(rand, sizeof(rand)) != EC_SUCCESS) { add_entropy_rv = EC_RES_ERROR; goto out; @@ -411,7 +410,7 @@ static void add_entropy_deferred(void) add_entropy_rv = EC_RES_SUCCESS; out: - exit_trng(); + trng_exit(); } DECLARE_DEFERRED(add_entropy_deferred); @@ -438,14 +437,13 @@ hc_rollback_add_entropy(struct host_cmd_handler_args *args) return EC_RES_INVALID_PARAM; } -DECLARE_HOST_COMMAND(EC_CMD_ADD_ENTROPY, - hc_rollback_add_entropy, +DECLARE_HOST_COMMAND(EC_CMD_ADD_ENTROPY, hc_rollback_add_entropy, EC_VER_MASK(0)); #endif /* CONFIG_RNG */ #endif /* CONFIG_ROLLBACK_SECRET_SIZE */ #endif /* CONFIG_ROLLBACK_UPDATE */ -static int command_rollback_info(int argc, char **argv) +static int command_rollback_info(int argc, const char **argv) { int ret = EC_ERROR_UNKNOWN; int region, min_region; @@ -467,14 +465,13 @@ static int command_rollback_info(int argc, char **argv) if (ret) goto failed; - ccprintf("rollback %d: %08x %08x %08x", - region, data.id, data.rollback_min_version, - data.cookie); + ccprintf("rollback %d: %08x %08x %08x", region, data.id, + data.rollback_min_version, data.cookie); #ifdef CONFIG_ROLLBACK_SECRET_SIZE if (!system_is_locked()) { /* If system is unlocked, show some of the secret. */ ccprintf(" [%02x..%02x]", data.secret[0], - data.secret[CONFIG_ROLLBACK_SECRET_SIZE-1]); + data.secret[CONFIG_ROLLBACK_SECRET_SIZE - 1]); } #endif if (min_region == region) @@ -487,8 +484,7 @@ failed: clear_rollback(&data); return ret; } -DECLARE_SAFE_CONSOLE_COMMAND(rollbackinfo, command_rollback_info, - NULL, +DECLARE_SAFE_CONSOLE_COMMAND(rollbackinfo, command_rollback_info, NULL, "Print rollback info"); static enum ec_status @@ -515,6 +511,5 @@ failed: clear_rollback(&data); return ret; } -DECLARE_HOST_COMMAND(EC_CMD_ROLLBACK_INFO, - host_command_rollback_info, +DECLARE_HOST_COMMAND(EC_CMD_ROLLBACK_INFO, host_command_rollback_info, EC_VER_MASK(0)); |