From 5fdd7861bb68206f28be40c8ec761d560bb8aa52 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Thu, 28 Mar 2019 22:58:40 +0800 Subject: [PATCH] Adding GSI public keys This CL adds three GSI keys, to allow booting a GSI with AVB to enable dm-verity. https://android.googlesource.com/platform/external/avb/ The keys for R and S GSI is to allow a device boots a new version of GSI in a Treble-compatible manner. For more information about GSI, please visit: https://source.android.com/setup/build/gsi Bug: 112293933 Test: m q-gsi.avbpubkey r-gsi.avbpubkey s-gsi.avbpubkey Change-Id: I4439e44fbd5da3240d7f6c7987f66445ec4590c5 --- rootdir/Android.mk | 2 ++ rootdir/avb/Android.mk | 46 ++++++++++++++++++++++++++++++++++++ rootdir/avb/q-gsi.avbpubkey | Bin 0 -> 1032 bytes rootdir/avb/r-gsi.avbpubkey | Bin 0 -> 1032 bytes rootdir/avb/s-gsi.avbpubkey | Bin 0 -> 1032 bytes 5 files changed, 48 insertions(+) create mode 100644 rootdir/avb/Android.mk create mode 100644 rootdir/avb/q-gsi.avbpubkey create mode 100644 rootdir/avb/r-gsi.avbpubkey create mode 100644 rootdir/avb/s-gsi.avbpubkey diff --git a/rootdir/Android.mk b/rootdir/Android.mk index f78a92680..5d307b859 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -376,3 +376,5 @@ $(LOCAL_BUILT_MODULE): $(hide) echo -n > $@ $(hide) $(foreach lib,$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \ echo $(lib).so >> $@;) + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk new file mode 100644 index 000000000..5dc019ca2 --- /dev/null +++ b/rootdir/avb/Android.mk @@ -0,0 +1,46 @@ +LOCAL_PATH:= $(call my-dir) + +####################################### +# q-gsi.avbpubkey +include $(CLEAR_VARS) + +LOCAL_MODULE := q-gsi.avbpubkey +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb +else +LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb +endif + +include $(BUILD_PREBUILT) + +####################################### +# r-gsi.avbpubkey +include $(CLEAR_VARS) + +LOCAL_MODULE := r-gsi.avbpubkey +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb +else +LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb +endif + +include $(BUILD_PREBUILT) + +####################################### +# s-gsi.avbpubkey +include $(CLEAR_VARS) + +LOCAL_MODULE := s-gsi.avbpubkey +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb +else +LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb +endif + +include $(BUILD_PREBUILT) diff --git a/rootdir/avb/q-gsi.avbpubkey b/rootdir/avb/q-gsi.avbpubkey new file mode 100644 index 0000000000000000000000000000000000000000..5ed7543ba22c4164b0ab153828a6b3bfe0d1289f GIT binary patch literal 1032 zcmV+j1o!&@01yD(;c0=8JaJn0B0#<(DW{QMqbdDcP`qtY2!e*!F^e6}Uj*Jb>60*lA@oN0+(ajXIPdhR}&EUp?c(M^6 zi*QoVQBhKj!KWq*d*l{4CsrCjPc_Fuu8v^`Rp^fgyHTTPs{5~o zI${|X;W}6)4A9YrMpXsir%JTapb#0aK>*t91*69lx63l$=)`5FAb}nv@{A{K6;6oB zs4W*Jo&8ca=g~#N|CN1}Pk03eFrp7Q6y;&rG4OE4EDTovT2f>ep%ExHBSQfkAp8;6 z!8M@G=LF61h~eo|BPyl!U1s&kdA5VjP&o2k!sMk^|`lL}R?dgf7vCA5}v#q98-@_%D- z!gj@qDsj@0jjiEA;A!UWoJKZc&;X*D)bIev@a%L}YM$312A*h|vXmcgz-LI9qJM-ATQ-^oFFzI~*DX*Gte zAaJRnzsg165Io~`G$9w7;%mn#`#=eWX&;w75Wc&d}2*#pDOG CUkH={ literal 0 HcmV?d00001 diff --git a/rootdir/avb/r-gsi.avbpubkey b/rootdir/avb/r-gsi.avbpubkey new file mode 100644 index 0000000000000000000000000000000000000000..2609b3037eac08b7ea9653dabc9e8f6c090b08e0 GIT binary patch literal 1032 zcmV+j1o!&@01yCX{@#0v1$Dzh2>)~!ai+Y*rAQU%fefCJm`H}0aEcJk0twPGe4Wq8 zc#Z1LW{!i38&+P9?;4B^;p8Jb{u~EZ-uq$Ttz-zH1LF2h#|nIhdYi|E;Mf;5%6v=U zRTi_cHTs`!s7W#*i#f6w7B^FoBTV*&9`#>5@kQvKl(h{qofL19rq-`v?scQssc|sX zZ>E-)UA_iQS^<1l@c$BL39iNw*LJ>o=PZ>yjHt(2jnU)1vdA!$>L6=$e4Ht4g*P}m z98?QLKgepC%HL3>d%Oet4AI2j%;UV+Sg=wpOAFp6FGTyPVVKWbI}A~qtBTJ$3`w*} z*Tm3_;bJR6=a7@(S~m%G>r~h`t%Z#`nBD$DzWKZJQxmkeCozyqz$N!RzEWFYoSI&~ z-W_|DtKem70$xmF%i$oN$kSqqjZSd(p(JjLm0?BS zxPu*-SYEMld(ViszGK<2UH+Ee8q8oD)nx@)`((`^91Td>XS) zud*KqL$EU7+tG3ip5TGHgWSU%P zgt(I?{j)qxW&m<=qOW>pB699(Y@V|IT3^3y&i`y0?&PW?zB7=lu!??8-Hl?(xujJO zc8?bh8Fc~Db^}?whdyhDy&>TLS5rFLni@d4^H?pQXz55-2xB_b$fayN_pD5-_Oe$$ z-EtNzg4=$`bRWm#7#6~Gn}!wX6G(=z>EsK9=d_7L*J>`Fj)IirCYI`4-)${XSJFOz z=IE$op6OS4l`bE!d43>8JZR$pLel6DYw2ydaG=yO!GSIRkg+&>`O>SFZg^H`1fJp) z`@sVE#%Um9>0jEAY}(SCVaeQR|T16QD69CoWYP1&%M_v|MIsT-qV5y z)kf}5u1TqRsU1eZT#u`Qwv-gXd+9@kvxIC&3R!`p%qeTdI?^VVZEFx#?}F$?vOSy3 ztvSKEE{x>dV}{WGE$p%|*n-kC5S9Y+j*o7VrL0=ut{- C{{=1p literal 0 HcmV?d00001 diff --git a/rootdir/avb/s-gsi.avbpubkey b/rootdir/avb/s-gsi.avbpubkey new file mode 100644 index 0000000000000000000000000000000000000000..9065fb83ff23ca5a0ab7c238aca0e88257cb8b23 GIT binary patch literal 1032 zcmV+j1o!&@01yB@P5GIx)IH-|v#Q9k-S zfvOD;X$WYMAQJ(p{s%jweHi*$B0Uu~|FG{6L^twr=9a`Q%`+-WMpcENA+~D_MOX@C zhk_8_3lV!4*Zi2kJp}0=yjT=K;9=mCuH+af)xC#R!Q zXWensVlX?h0%#2J6H6&;X=Y)cA^u0CfiJ5Wt=rL*3_A}<4F#9MWQr-M5BA^rb(zm5$&p;a?FjL%tr!wZl_W zjx=~K*xVx}E}TN3hrHfWmjkgFqC*AcYiPLsD>!{qke;@CsZ>)XMbiImg!XbNxBn+)ra?@>0wuu^m36 zV}vQ&Gc~?6x(RiC^Co(Refb@Y{SwAyL&;}=s#aKhDC802R!J#?Err{s{BYq!k~QLe<})**@=&b@gPK2dv5*eaCQW_2R83MP1_Zl+4ZJ${ z_EV}jOlViwG#sjc3!d$poryOYVT@Q;Zqo{b{b1a_yZ>Op*Ik}Eum%zwu9bA$NJgG& z;7x?I_>@#aaPV;3qSwvFgJGUMAHa==|IR`?SVRA<9)edfcDl6wd$qCW*XhyyK5L00 z7C9oC&mzH+8R<)-c5dyEIf7P0GnQQ&d7DbdICY<(oCA_>`E0A0-=&Y5DK)V8LV7I_ CTlMq+ literal 0 HcmV?d00001