diff options
| author | Patryk Duda <pdk@semihalf.com> | 2023-04-06 12:55:39 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-11 08:53:30 +0000 |
| commit | 2268e6720cc6e17e55d55f30a7f419b97ffc60e2 (patch) | |
| tree | c5d526dfafee9369c03cb2d2bce0eb18907ce6e4 | |
| parent | 513f2d68b8f0b83d899cd09c50fc09a8b657e853 (diff) | |
| download | chrome-ec-2268e6720cc6e17e55d55f30a7f419b97ffc60e2.tar.gz | |
rollback: Move variables declaration under one #ifdef in add_entropy()
Since we don't need to create variables at the beginning of the
function we can merge two CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE
blocks into one. This patch introduces no functional changes.
BUG=b:277029648
BRANCH=none
TEST=make BOARD=bloonchipper
TEST=./test/run_device_tests.py -b bloonchipper -t rollback.*
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Change-Id: I2eff4fed07e8edb983384ed4cff72b1e0ffbd379
Signed-off-by: Patryk Duda <pdk@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4408869
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Patryk Duda <patrykd@google.com>
Tested-by: Patryk Duda <patrykd@google.com>
| -rw-r--r-- | common/rollback.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/common/rollback.c b/common/rollback.c index e530397af1..203a4cf6ec 100644 --- a/common/rollback.c +++ b/common/rollback.c @@ -200,17 +200,15 @@ static int add_entropy(uint8_t *dst, const uint8_t *src, const uint8_t *add, BUILD_ASSERT(SHA256_DIGEST_SIZE == CONFIG_ROLLBACK_SECRET_SIZE); struct sha256_ctx ctx; uint8_t *hash; -#ifdef CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE - uint8_t extra; - int i; -#endif SHA256_init(&ctx); SHA256_update(&ctx, src, CONFIG_ROLLBACK_SECRET_SIZE); SHA256_update(&ctx, add, add_len); #ifdef CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE /* Add some locally produced entropy */ - for (i = 0; i < CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE; i++) { + for (int i = 0; i < CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE; i++) { + uint8_t extra; + if (!board_get_entropy(&extra, 1)) goto failed; SHA256_update(&ctx, &extra, 1); |