Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5
am: dbab538973
am: 96c6d382fa
am: 183fb0df0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268 Change-Id: Icf2c64b5d8a233639f70e64680b4e775de123fa0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4bd03eda16
1 changed files with 1 additions and 1 deletions
|
@ -964,7 +964,7 @@ def ReplaceVerityKeyId(input_zip, output_zip, key_path):
|
||||||
keyid, stderr = p.communicate()
|
keyid, stderr = p.communicate()
|
||||||
assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr)
|
assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr)
|
||||||
keyid = re.search(
|
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))
|
print("Replacing verity keyid with {}".format(keyid))
|
||||||
out_buffer.append("veritykeyid=id:%s" % (keyid,))
|
out_buffer.append("veritykeyid=id:%s" % (keyid,))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue