p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add a guard against deleting AVB_PUBKey."

This commit is contained in:
Baligh Uddin 2019-08-26 05:04:46 +00:00 committed by Gerrit Code Review
parent e7f5833792 15881282d7
commit 667c1aa83d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/apex_utils.py
View File

@ -177,6 +177,7 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
payload_dir = common.MakeTempDir(prefix='apex-payload-') payload_dir = common.MakeTempDir(prefix='apex-payload-')
with zipfile.ZipFile(apex_file) as apex_fd: with zipfile.ZipFile(apex_file) as apex_fd:
payload_file = apex_fd.extract(APEX_PAYLOAD_IMAGE, payload_dir) payload_file = apex_fd.extract(APEX_PAYLOAD_IMAGE, payload_dir)
zip_items = apex_fd.namelist()
payload_info = ParseApexPayloadInfo(avbtool, payload_file) payload_info = ParseApexPayloadInfo(avbtool, payload_file)
SignApexPayload( SignApexPayload(
@ -192,7 +193,8 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
payload_public_key = common.ExtractAvbPublicKey(avbtool, payload_key) payload_public_key = common.ExtractAvbPublicKey(avbtool, payload_key)
common.ZipDelete(apex_file, APEX_PAYLOAD_IMAGE) common.ZipDelete(apex_file, APEX_PAYLOAD_IMAGE)
common.ZipDelete(apex_file, APEX_PUBKEY) if APEX_PUBKEY in zip_items:
common.ZipDelete(apex_file, APEX_PUBKEY)
apex_zip = zipfile.ZipFile(apex_file, 'a') apex_zip = zipfile.ZipFile(apex_file, 'a')
common.ZipWrite(apex_zip, payload_file, arcname=APEX_PAYLOAD_IMAGE) common.ZipWrite(apex_zip, payload_file, arcname=APEX_PAYLOAD_IMAGE)
common.ZipWrite(apex_zip, payload_public_key, arcname=APEX_PUBKEY) common.ZipWrite(apex_zip, payload_public_key, arcname=APEX_PUBKEY)