Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 425f7d1c authored by Hongguang Chen's avatar Hongguang Chen Committed by Devin Moore
Browse files

Support chained init_boot partition signing 

Bug: 256048561
Bug: 256237041
Test: sign_target_files_apks -d certs --avb_init_boot_algorithm \
        SHA256_RSA4096 --avb_init_boot_key init_boot_rsa4096.pem \
	xxx.zip signed.zip (Check signed.zip/META/misc_info.txt)
Change-Id: I65fc7913089ae318d90df55a533d3e2ebd93b029
(cherry picked from commit 0d6b727e)
Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029
(cherry picked from commit acf1b3af)
parent 2acb9f70

tools/releasetools/sign_target_files_apks.py

+14 −5
Original line number Diff line number Diff line
@@ -99,14 +99,14 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files 
      The second dir will be used for lookup if BOARD_USES_RECOVERY_AS_BOOT is

      set to true.



  --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,

         vbmeta_vendor}_algorithm <algorithm>

  --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,

         vbmeta_vendor}_key <key>

  --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta,

         vbmeta_system,vbmeta_vendor}_algorithm <algorithm>

  --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta,

         vbmeta_system,vbmeta_vendor}_key <key>

      Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign

      the specified image. Otherwise it uses the existing values in info dict.



  --avb_{apex,boot,recovery,system,system_other,vendor,dtbo,vbmeta,

  --avb_{apex,init_boot,boot,recovery,system,system_other,vendor,dtbo,vbmeta,

         vbmeta_system,vbmeta_vendor}_extra_args <args>

      Specify any additional args that are needed to AVB-sign the image

      (e.g. "--signing_helper /path/to/helper"). The args will be appended to
@@ -1427,6 +1427,12 @@ def main(argv): 
      OPTIONS.avb_algorithms['dtbo'] = a

    elif o == "--avb_dtbo_extra_args":

      OPTIONS.avb_extra_args['dtbo'] = a

    elif o == "--avb_init_boot_key":

      OPTIONS.avb_keys['init_boot'] = a

    elif o == "--avb_init_boot_algorithm":

      OPTIONS.avb_algorithms['init_boot'] = a

    elif o == "--avb_init_boot_extra_args":

      OPTIONS.avb_extra_args['init_boot'] = a

    elif o == "--avb_recovery_key":

      OPTIONS.avb_keys['recovery'] = a

    elif o == "--avb_recovery_algorithm":
@@ -1518,6 +1524,9 @@ def main(argv): 
          "avb_dtbo_algorithm=",

          "avb_dtbo_key=",

          "avb_dtbo_extra_args=",

          "avb_init_boot_algorithm=",

          "avb_init_boot_key=",

          "avb_init_boot_extra_args=",

          "avb_recovery_algorithm=",

          "avb_recovery_key=",

          "avb_recovery_extra_args=",