diff options
| author | fang hui <hui.fang@nxp.com> | 2017-04-27 14:50:03 +0800 |
|---|---|---|
| committer | fang hui <hui.fang@nxp.com> | 2017-04-27 15:16:25 +0800 |
| commit | 71dc860a61a936eca242c2badaad8815b352905b (patch) | |
| tree | 32469833d886b05dae2ddee032a74bb8d8081a7b /lib/avb/fsl/fsl_avbkey.c | |
| parent | 4dc1d71d0da1d07913ef91e60f54338db70caa69 (diff) | |
| download | u-boot-imx-imx_v2015.04_brillo.zip u-boot-imx-imx_v2015.04_brillo.tar.gz u-boot-imx-imx_v2015.04_brillo.tar.bz2 | |
MA-9530-2 [iot] Revet avb in ubootimx_v2015.04_brillo
Revert "libavb: upgrade avb"
This reverts commit 94734eeca56e8d1b9f1baedf67e16cd0397fc178.
Change-Id: I6eae3fa9579fb43fa6956c450011b230875d0a96
Diffstat (limited to 'lib/avb/fsl/fsl_avbkey.c')
| -rw-r--r-- | lib/avb/fsl/fsl_avbkey.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/avb/fsl/fsl_avbkey.c b/lib/avb/fsl/fsl_avbkey.c index c40dc9e..1cd76c5 100644 --- a/lib/avb/fsl/fsl_avbkey.c +++ b/lib/avb/fsl/fsl_avbkey.c @@ -405,7 +405,7 @@ int rbkidx_erase(void) { return -1; memset(rbidx, 0, rbidx_len); *(uint64_t *)rbidx = AVB_RBIDX_INITVAL; - for (i = 0; i < AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS; i++) { + for (i = 0; i < AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_SLOTS; i++) { tag = &hdr.rbk_tags[i]; tag->flag = AVB_RBIDX_FLAG; tag->offset = offset; @@ -490,7 +490,7 @@ int avbkey_init(uint8_t *plainkey, uint32_t keylen) { return -1; memset(rbidx, 0, rbidx_len); *(uint64_t *)rbidx = AVB_RBIDX_INITVAL; - for (i = 0; i < AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS; i++) { + for (i = 0; i < AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_SLOTS; i++) { tag = &hdr.rbk_tags[i]; tag->flag = AVB_RBIDX_FLAG; tag->offset = offset; @@ -525,8 +525,6 @@ int avbkey_init(uint8_t *plainkey, uint32_t keylen) { AvbIOResult fsl_validate_vbmeta_public_key_rpmb(AvbOps* ops, const uint8_t* public_key_data, size_t public_key_length, - const uint8_t* public_key_metadata, - size_t public_key_metadata_length, bool* out_is_trusted) { kblb_hdr_t hdr; kblb_tag_t *pubk; @@ -611,7 +609,7 @@ AvbIOResult fsl_read_rollback_index_rpmb(AvbOps* ops, size_t rollback_index_slot DEBUGAVB("[rpmb] read rollback slot: %zu\n", rollback_index_slot); - if (rollback_index_slot >= AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS) + if (rollback_index_slot >= AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_SLOTS) return AVB_IO_RESULT_ERROR_IO; if ((mmc_dev = get_mmc()) == NULL) { @@ -678,7 +676,7 @@ AvbIOResult fsl_write_rollback_index_rpmb(AvbOps* ops, size_t rollback_index_slo assert(ops != NULL); - if (rollback_index_slot >= AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_LOCATIONS) + if (rollback_index_slot >= AVB_MAX_NUMBER_OF_ROLLBACK_INDEX_SLOTS) return AVB_IO_RESULT_ERROR_IO; if ((mmc_dev = get_mmc()) == NULL) { |