Commit graph

78844 commits

Author SHA1 Message Date
Kelvin Zhang
9f0379bd60 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
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
(cherry picked from commit b7d70a2cb1)
2023-01-05 12:02:13 +00:00
Steve Berbary
561c85919c [automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours am: 6a991a76ce -s ours
am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: Ied5a3e5d9625be31c285cefb6a0039dafb44067e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 03:11:54 +00:00
Steve Berbary
6a991a76ce [automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours
am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I191008fd08d7a37a64aa8f76fef401e742755c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:39:01 +00:00
Steve Berbary
e5bd30dd33 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I106595aa928c539025299d229d193869eb77fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:27:25 +00:00
Steve Berbary
4af84f8cf1 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I980866984561c3daa4d31ffa91d743ccb6abae13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:11:02 +00:00
Steve Berbary
23dae41cbc Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I4fe31036b0ecebb5a6cfb8b4080e692e54e36068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 22:58:04 +00:00
Steve Berbary
6b05071cb3 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I7e967462a1110696405c7ebd69d2faf624b5ef7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 21:51:48 +00:00
Steve Berbary
445dfdc147 Update Security String to 2023-02-01 am: b601ce96db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I524f6521a7aa06e1cb27b5217486ab3141d2978b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 20:41:42 +00:00
Steve Berbary
3b0b33502f Update Security String to 2023-02-01 am: d0a709ffca
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20679823

Change-Id: I7037e652ebab3d41bae6dcfa780d2348884f1e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 20:39:42 +00:00
Steve Berbary
d0a709ffca Update Security String to 2023-02-01
Bug: 261738635

Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-08 18:37:49 +00:00
Steve Berbary
b601ce96db Update Security String to 2023-02-01
Bug: 261738635

Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-07 19:21:42 +00:00
Hongguang Chen
425f7d1cb3 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 0d6b727e03)
Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029
(cherry picked from commit acf1b3afe2)
2022-11-15 22:30:54 +00:00
Steve Berbary
2acb9f7049 [automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours am: 149efcc09a -s ours
am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: I1cfb6b99f09e11860ba8b2f11296b9c5673a726a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:20:57 +00:00
Steve Berbary
149efcc09a [automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours
am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Iece135709b1ebef6311749ed0d4b986cdf72e0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:40:31 +00:00
Steve Berbary
0d0b75bcf2 Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Ib0e3df96717b5079645139ef7ab5e816cc6a3a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:07:51 +00:00
Steve Berbary
6ed124904e Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: I2a952f5842e16551e171eabf2f51082805e7383b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 20:37:22 +00:00
Steve Berbary
f1cdafb8f3 Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Id358b18b9f7324af0e5a434f9f8f304e1ac09da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 20:04:56 +00:00
Steve Berbary
a436638431 Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Ib124bfdfa12cf7a84d20828271443f64cf339e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:35:17 +00:00
Steve Berbary
404ee70ff1 Update Security String to 2023-01-01 am: 31bb5f4be2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Id370b73b62a02712ebecddc0c64f84010b877831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:07:53 +00:00
Steve Berbary
d80639db53 Update Security String to 2023-01-01 am: 26c214ebb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20455773

Change-Id: I6ee4a90fa01ca59fea7e1b9aacb4255442117fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 19:05:27 +00:00
Steve Berbary
26c214ebb8 Update Security String to 2023-01-01
Bug: 258811679

Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
Merged-In: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
2022-11-12 01:19:32 +00:00
Steve Berbary
31bb5f4be2 Update Security String to 2023-01-01
Bug: 258811679

Change-Id: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
Merged-In: Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1
2022-11-11 18:08:36 +00:00
Steve Berbary
b0a0ce6728 [automerger skipped] Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5 am: e3c6411b3a am: b69ef0361e am: e2e9428a9c -s ours
am skip reason: Merged-In Ic00bf503ad58f93db47025a1f6c2037968f07442 with SHA-1 29b4ab90cb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: If78c5870c31b365abd2d5b9fa10ca85434f53dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 08:44:12 +00:00
Steve Berbary
5d24b2059e [automerger skipped] Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5 am: e3c6411b3a am: b69ef0361e am: 73aadc06b1 -s ours am: 741f3eccea -s ours
am skip reason: Merged-In Ic00bf503ad58f93db47025a1f6c2037968f07442 with SHA-1 59b4f51bdd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: I917c5680a871f9238337e87b62c2d0423fd12d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 08:41:32 +00:00
Steve Berbary
741f3eccea [automerger skipped] Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5 am: e3c6411b3a am: b69ef0361e am: 73aadc06b1 -s ours
am skip reason: Merged-In Ic00bf503ad58f93db47025a1f6c2037968f07442 with SHA-1 59b4f51bdd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: If4ccff4a72522e6d4f137b0abf71638df325e235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 08:14:41 +00:00
Steve Berbary
73aadc06b1 Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5 am: e3c6411b3a am: b69ef0361e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: Ic077fb16e1af7d0d6f815fc41c7e55a7787c4eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 07:47:02 +00:00
Steve Berbary
e2e9428a9c Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5 am: e3c6411b3a am: b69ef0361e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: I969edead70798ecad7a2b6efe62218372484ec5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 07:46:03 +00:00
Steve Berbary
b69ef0361e Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5 am: e3c6411b3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: Ib8bf7083f9f31a234fc08e5ed86e9d9e0f5a5185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 07:16:21 +00:00
Steve Berbary
e3c6411b3a Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1 am: 06824008a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: I1ce3e5464a659b4665aa0296129a781ebb2c145b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 06:47:24 +00:00
Steve Berbary
06824008a5 Update Security String to 2022-12-01 am: 29b4ab90cb am: 52572070e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: I8a700946c03e40ad32f81ab50e14c88149b8fda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 06:19:21 +00:00
Steve Berbary
52572070e1 Update Security String to 2022-12-01 am: 29b4ab90cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20112472

Change-Id: If1456290f16b023dcdced7ff24e89bc2eec08996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 05:51:12 +00:00
Steve Berbary
37ec3ec3c8 [automerger skipped] Update Security String to 2022-12-01 am: 59b4f51bdd -s ours
am skip reason: Merged-In Ic00bf503ad58f93db47025a1f6c2037968f07442 with SHA-1 eef4b24433 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20116309

Change-Id: I018266fe46fca3c79c08e5cffcd3978e44404b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 05:04:00 +00:00
Steve Berbary
59b4f51bdd Update Security String to 2022-12-01
Bug: 250644806
Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442
Merged-In: Ic00bf503ad58f93db47025a1f6c2037968f07442
2022-10-05 02:21:00 +00:00
Steve Berbary
eef4b24433 Update Security String to 2022-12-01
Bug: 250644806
Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442
Merged-In: Ic00bf503ad58f93db47025a1f6c2037968f07442
2022-10-04 18:57:30 +00:00
Steve Berbary
29b4ab90cb Update Security String to 2022-12-01
Bug: 250644806
Change-Id: Ic00bf503ad58f93db47025a1f6c2037968f07442
Merged-In: Ic00bf503ad58f93db47025a1f6c2037968f07442
2022-10-04 18:47:40 +00:00
Duy Truong
495f4c0776 Merge "Initial STS sdk" into sc-dev am: e0438b6f1b am: 214aa1d785 am: a0b3f427ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: I88e5ca838d57a6fcca66ee88a3ac3e26a6cd4ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 03:09:43 +00:00
Duy Truong
a0b3f427ca Merge "Initial STS sdk" into sc-dev am: e0438b6f1b am: 214aa1d785
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: I0d8a3d02cbcc97e202cfb8848363d598442edf99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 02:21:37 +00:00
Duy Truong
85e7247e9d Merge "Initial STS sdk" into sc-dev am: e0438b6f1b am: f81c5d3cbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: Ieb2870a78999e42c86fb2a4e5c0914013ff1aa18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:56:55 +00:00
Duy Truong
19ef59596a Merge changes from topic "sts-sdk" into sc-mainline-prod am: 4db0005a13
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: I1830f6af17c2d559fb317bf181214c28155ba1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:53:05 +00:00
Duy Truong
f81c5d3cbe Merge "Initial STS sdk" into sc-dev am: e0438b6f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: Ifc39749d2c8e783439a530d13c27bb976c5c8743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:29:42 +00:00
Duy Truong
214aa1d785 Merge "Initial STS sdk" into sc-dev am: e0438b6f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: Ic7eca857f841732f502b18f964f038c06ce5d6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:27:35 +00:00
Duy Truong
bf9931ccdf Merge changes from topic "sts-sdk" into sc-qpr1-dev am: 5bfd2ef9a6 am: cec272cdac
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: I120356fa8131a7d5a978f780571aacd28e628888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 01:00:46 +00:00
Duy Truong
cec272cdac Merge changes from topic "sts-sdk" into sc-qpr1-dev am: 5bfd2ef9a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19776213

Change-Id: Idb97eac81a299fd942e4896d0a651ab711cdd3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:38:29 +00:00
Duy Truong
e0438b6f1b Merge "Initial STS sdk" into sc-dev 2022-09-22 00:29:25 +00:00
Duy Truong
4db0005a13 Merge changes from topic "sts-sdk" into sc-mainline-prod
* changes:
  [automerge] Initial STS sdk 2p: 5987bd823b
  Initial STS sdk
2022-09-22 00:29:25 +00:00
Duy Truong
5bfd2ef9a6 Merge changes from topic "sts-sdk" into sc-qpr1-dev
* changes:
  [automerge] Initial STS sdk 2p: 5987bd823b
  Initial STS sdk
2022-09-22 00:29:25 +00:00
Duy Truong
7634f909cb Merge changes from topic "sts-sdk" into tm-dev
* changes:
  [automerge] Initial STS sdk 2p: 5987bd823b 2p: afcd8ed66a
  [automerge] Initial STS sdk 2p: 5987bd823b
  Initial STS sdk
2022-09-22 00:29:25 +00:00
Steve Berbary
443a09e2c5 [automerger skipped] Update Security String to 2022-11-01 am: ea15a5ac28 am: 364bfc6a3e am: d4741d3af1 am: 5739c7d740 am: bb0c170555 am: 8a59399dbb -s ours am: d3188f6648 -s ours
am skip reason: Merged-In If6c0dc2d69b70f9722da0950582aa5acf224c0fe with SHA-1 f3d97804ef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19912058

Change-Id: Ib028d5383adfe2ae77de167bdcf98d2ccf9b2d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 05:08:21 +00:00
Steve Berbary
d3188f6648 [automerger skipped] Update Security String to 2022-11-01 am: ea15a5ac28 am: 364bfc6a3e am: d4741d3af1 am: 5739c7d740 am: bb0c170555 am: 8a59399dbb -s ours
am skip reason: Merged-In If6c0dc2d69b70f9722da0950582aa5acf224c0fe with SHA-1 f3d97804ef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19912058

Change-Id: I148ad88db60b83747fa4cf5d9bf7b855cfe8db5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 04:26:53 +00:00
Steve Berbary
2f214ea6d6 [automerger skipped] Update Security String to 2022-11-01 am: ea15a5ac28 am: 364bfc6a3e am: d4741d3af1 am: 5739c7d740 am: bb0c170555 am: 41be59541f -s ours
am skip reason: Merged-In If6c0dc2d69b70f9722da0950582aa5acf224c0fe with SHA-1 f3d97804ef is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19912058

Change-Id: Id3b395da4952f7c5fc0515dc17d97c2ac3bd61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 04:26:29 +00:00