diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2022-12-22 10:30:00 -0800 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2023-01-10 20:03:05 +0000 |
| commit | a7e7e0bbf59b51aa9358bf5cef903026ad056a01 (patch) | |
| tree | 8ed6de460c39aa03e7306092b7ec085ea53963c9 | |
| parent | 6b05071cb38baac9d6f6a7304e7fe029cf9f94c3 (diff) | |
| download | build-a7e7e0bbf59b51aa9358bf5cef903026ad056a01.tar.gz | |
Fix VB 1.0 failure due to openssl output format change
Openssl changed output format, the 'keyid:' prefix is removed, hence old
regex is unable to extract key id.
Bug: 262902909
Change-Id: Iea5b6fffed7c27855d87e35292f07a56686e4197
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
Merged-In: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6
(cherry picked from commit b7d70a2cb114ecbe9c931d59d852f5ada771ab52)
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 47360c9464..6b83a22f9f 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -924,7 +924,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,)) |