platform: msm_shared: Remove scratch address support from hash_verification
For image verification, salt is copied to start of image, and hash is
calculated. Change enable to add buffer at start of image for copying
salt and verify the image.
Change-Id: I653251d3d3e2f9a5c44abd50f3a3a93d5cd09062
diff --git a/platform/msm_shared/avb/libavb/avb_slot_verify.c b/platform/msm_shared/avb/libavb/avb_slot_verify.c
index b279e22..ac17e93 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -185,17 +185,16 @@
if (avb_strcmp((const char*)hash_desc.hash_algorithm, "sha256") == 0) {
uint32_t complete_len = hash_desc.salt_len + hash_desc.image_size;
- uint8_t *complete_buf = (uint8_t *)target_get_scratch_address()+0x08000000;
digest = avb_malloc(AVB_SHA256_DIGEST_SIZE);
- if(digest == NULL)
+ if(digest == NULL || hash_desc.salt_len > SALT_BUFF_OFFSET )
{
avb_errorv(part_name, ": Failed to allocate memory\n", NULL);
ret = AVB_SLOT_VERIFY_RESULT_ERROR_IO;
goto out;
}
- avb_memcpy(complete_buf, desc_salt, hash_desc.salt_len);
- avb_memcpy(complete_buf + hash_desc.salt_len, image_buf, hash_desc.image_size);
- hash_find(complete_buf, complete_len, digest, CRYPTO_AUTH_ALG_SHA256);
+ image_buf = ADD_SALT_BUFF_OFFSET(image_buf) - hash_desc.salt_len;
+ avb_memcpy(image_buf, desc_salt, hash_desc.salt_len);
+ hash_find(image_buf, complete_len, digest, CRYPTO_AUTH_ALG_SHA256);
digest_len = AVB_SHA256_DIGEST_SIZE;
} else if (avb_strcmp((const char*)hash_desc.hash_algorithm, "sha512") == 0) {
AvbSHA512Ctx sha512_ctx;