scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-08 16:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow hashing an empty RW image

Browse Source 
BUG=chrome-os-partner:13084
TEST=manual

flash_erase 0x14000 0x14000
reboot
hash
  Offset: 0x00014000
  Size:   0x00000000 (0)
  Digest: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855

BRANCH=link,snow

Change-Id: I3152c201edac5ef6ad8e28c4e55cd6245b61e786
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/31277
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
This commit is contained in:
Randall Spangler
2012-08-23 16:05:57 -07:00
committed by Gerrit
parent 265478ccdf
commit 64351b371c
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/vboot_hash.c
View File

@@ -35,19 +35,10 @@ static uint32_t data_size;
static uint32_t curr_pos;
static const uint8_t *hash; /* Hash, or NULL if not valid */
static int want_abort;
static int in_progress;
static SHA256_CTX ctx;
/* Return non-zero if a hash operation is in progress */
static int vboot_hash_in_progress(void)
{
if (hash)
return 0; /* Already done */
return data_size ? 1 : 0; /* Nothing to hash */
}
/*
* Start computing a hash of <size> bytes of data at flash offset <offset>.
* If nonce_size is non-zero, prefixes the <nonce> onto the data to be
@@ -57,7 +48,7 @@ static int vboot_hash_start(uint32_t offset, uint32_t size,
const uint8_t *nonce, int nonce_size)
{
/* Fail if hash computation is already in progress */
if (vboot_hash_in_progress())
if (in_progress)
return EC_ERROR_BUSY;
/*
@@ -92,7 +83,7 @@ static int vboot_hash_start(uint32_t offset, uint32_t size,
/* Abort hash currently in progress, if any. */
static void vboot_hash_abort(void)
{
if (vboot_hash_in_progress())
if (in_progress)
want_abort = 1;
}
@@ -116,6 +107,7 @@ static void vboot_hash_init(void)
vboot_hash_start(CONFIG_FW_RW_OFF,
system_get_image_used(SYSTEM_IMAGE_RW),
NULL, 0);
in_progress = 1;
}
}
@@ -125,7 +117,7 @@ void vboot_hash_task(void)
vboot_hash_init();
while (1) {
if (!vboot_hash_in_progress()) {
if (!in_progress) {
/* Nothing to do, so go back to sleep */
task_wait_event(-1);
} else if (want_abort) {
@@ -133,6 +125,7 @@ void vboot_hash_task(void)
CPRINTF("[%T hash abort]\n");
data_size = 0;
want_abort = 0;
in_progress = 0;
} else {
/* Compute the next chunk of hash */
int size = MIN(CHUNK_SIZE, data_size - curr_pos);
@@ -146,6 +139,7 @@ void vboot_hash_task(void)
hash = SHA256_final(&ctx);
CPRINTF("[%T hash done %.*h]\n",
SHA256_DIGEST_SIZE, hash);
in_progress = 0;
}
/*
@@ -191,7 +185,7 @@ static int command_hash(int argc, char **argv)
ccprintf("Offset: 0x%08x\n", data_offset);
ccprintf("Size: 0x%08x (%d)\n", data_size, data_size);
ccprintf("Digest: ");
if (vboot_hash_in_progress())
if (in_progress)
ccprintf("(in progress)\n");
else
ccprintf("%.*h\n", SHA256_DIGEST_SIZE, hash);
@@ -236,7 +230,7 @@ DECLARE_CONSOLE_COMMAND(hash, command_hash,
/* Fill in the response with the current hash status */
static void fill_response(struct ec_response_vboot_hash *r)
{
if (vboot_hash_in_progress())
if (in_progress)
r->status = EC_VBOOT_HASH_STATUS_BUSY;
else if (hash) {
r->status = EC_VBOOT_HASH_STATUS_DONE;
@@ -297,7 +291,7 @@ static int host_command_vboot_hash(struct host_cmd_handler_args *args)
return EC_RES_ERROR;
/* Wait for hash to finish */
while (vboot_hash_in_progress())
while (in_progress)
usleep(1000);
fill_response(r);