| commit | dbab538973811029a4de3bd393afd3274620ac86 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Wed Jan 11 01:51:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 01:51:19 2023 +0000 |
| tree | 97d0422d3ec4eec58b9d6a6a7adf8bb6566bc10f | |
| parent | 23dae41cbc34842d20de0fbbbdb18b0544a35f03 [diff] | |
| parent | a7e7e0bbf59b51aa9358bf5cef903026ad056a01 [diff] |
Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268 Change-Id: I3245bc7f6f23334f5efeeef2fcedd106919747b3 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 47360c9..6b83a22 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py
@@ -924,7 +924,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,))