Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 am: dbab538973

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268

Change-Id: I3d7757afff5bd23b2f4b075505b0b7bb292eacf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang 2023-01-11 02:45:05 +00:00 committed by Automerger Merge Worker
commit 96c6d382fa

View file

@ -948,7 +948,7 @@ def ReplaceVerityKeyId(input_zip, output_zip, key_path):
keyid, stderr = p.communicate()
assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr)
keyid = re.search(
r'keyid:([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower()
r'Authority Key Identifier:\s*(?:keyid:)?([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower()
print("Replacing verity keyid with {}".format(keyid))
out_buffer.append("veritykeyid=id:%s" % (keyid,))