mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
|
From b7d70a2cb114ecbe9c931d59d852f5ada771ab52 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kelvin Zhang <zhangkelvin@google.com>
|
||
|
|
Date: Thu, 22 Dec 2022 10:30:00 -0800
|
||
|
|
Subject: [PATCH] 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: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6
|
||
|
|
---
|
||
|
|
tools/releasetools/sign_target_files_apks.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
|
||
|
|
index 837eaf9c1e..09d0b10a42 100755
|
||
|
|
--- a/tools/releasetools/sign_target_files_apks.py
|
||
|
|
+++ b/tools/releasetools/sign_target_files_apks.py
|
||
|
|
@@ -1032,7 +1032,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,))
|
||
|
|
|