| commit | 96c6d382fa9df459e2ac19343bf6daf252e7826b | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Wed Jan 11 02:45:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 02:45:05 2023 +0000 |
| tree | 61e394d894f604a3bf6ebfc6469eb96dba0b7c92 | |
| parent | 4af84f8cf13ace3aec4ecdfd4fca4129f82597cc [diff] | |
| parent | dbab538973811029a4de3bd393afd3274620ac86 [diff] |
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>
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 0842af9..8b774a7 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py
@@ -948,7 +948,7 @@ 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,))