From ed1aa13e5b705751a4dae1afe46981a517500a26 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 22 Apr 2021 16:43:23 +0900 Subject: [PATCH] Add AOSP certificates for connectivity resources Instead of the platform certificate, use a dedicated certificate. The AOSP certificates are only used for testing as they have known keys, and are replaced when resigning production images. Key generated with: openssl req -x509 -newkey rsa:4096 -nodes -days 999999 -keyout key.pem \ -out com.android.connectivity.resources.x509.pem openssl pkcs8 -topk8 -inform PEM -outform DER -in key.pem -out \ com.android.connectivity.resources.pk8 -nocrypt Fixes: 184808224 Fixes: 185462051 Test: m Change-Id: I25cddc8d5ab948da9d3a2dbcd202ece1f61dd5a2 --- .../ServiceConnectivityResources/Android.bp | 8 ++- .../com.android.connectivity.resources.pk8 | Bin 0 -> 2375 bytes ...om.android.connectivity.resources.x509.pem | 36 ++++++++++++ .../resources-certs/key.pem | 52 ++++++++++++++++++ 4 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 service/ServiceConnectivityResources/resources-certs/com.android.connectivity.resources.pk8 create mode 100644 service/ServiceConnectivityResources/resources-certs/com.android.connectivity.resources.x509.pem create mode 100644 service/ServiceConnectivityResources/resources-certs/key.pem diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp index fa4501ac7f..552a0778d3 100644 --- a/service/ServiceConnectivityResources/Android.bp +++ b/service/ServiceConnectivityResources/Android.bp @@ -30,6 +30,10 @@ android_app { apex_available: [ "com.android.tethering", ], - // TODO: use a dedicated cert once generated - certificate: "platform", + certificate: ":com.android.connectivity.resources.certificate", +} + +android_app_certificate { + name: "com.android.connectivity.resources.certificate", + certificate: "resources-certs/com.android.connectivity.resources", } diff --git a/service/ServiceConnectivityResources/resources-certs/com.android.connectivity.resources.pk8 b/service/ServiceConnectivityResources/resources-certs/com.android.connectivity.resources.pk8 new file mode 100644 index 0000000000000000000000000000000000000000..bfdc28b313ec197438aa5fa9a0ab16c2a2d711f8 GIT binary patch literal 2375 zcmV-N3Apw!f(b(c0RS)!1_>&LNQUwEii%!DFOii0)heo0JrN?Q}(2@ zhkJ`~utV#y%@b4?-zhK~EIhlhG0v)NsIaqU!-5qOP$iFop12KY4D>a3jkg}dE}H!~ zC6;V$N=*;IHdK6rtU{_#B;yxi#=s{cP*fxzbom)%acbp=MmswPDkAOi{-?g>M0bj^ z1!UkUG;^l!tq+YEdsSd3VUWK*85Ytau$&u&_orPvf?W8kqNpbiDfwU*kK>uK(`W8( zy;XRsN9euI_~3cawF&|bh7s{H3(5BHEU%L`08;m zFqxyQpHZP(BLJgPj;x>PEy8cYPEY?u#L4Mm@9@%6k)vWDAXvfH2JzMv}OL))SlVN>;lXF4%ig+;A&yM@4SdxX_sXbiSiL_3Os zSk@?48E)pkS@YX$SdArjI2g!2PV0w;+I2{Z-kASgY3h(BO%4_)b_^nJ@lXw{i8IIG zzXk2YG4hl##IioCm6|^69%{f)N)S6B2RlzuA}tYOv?HuqQeT1oj%&IT!WRHq9?3f= z{uYiNj#`z$#PB-HI$-0*f$qzJ1*_zG4n?=BPUYa6FU#SdIru;UH0w3yYlmk0EOU`yjd5s7Z{b4-xL%Kc&`dH-Joo&Je1&Iv7tb37xO*m zekIldj>^3ul@2tW4kQJp+na0_IG~lzV#KsrmS5CW(%9FeOH&G{EE-z~%98TiU#_DM z5(bFjk)N?S5QW)zuNv->D%HY}XHW?=gCZnLReJl+gH8K!PL-EnxFB z1`H)iAI{=1$;&v1?@T!Hl=L~f0?pquY z@@~$prwf_UJBi%l6<#0caMe+PBZ5fCtH0v7yLi)~d?S4|)N|QfpWxn|lj#~|78gqy z^L(vlZC({v24<7`_l-iqq@Hig#c)VCdfk)VY@s!CbMZI2j?~~+^e@l%wLQZCL0H5! z)ChkT*oIl_HE))w&mV`S#>3b%s_i2Rx!SjmOtWzdy85Zxu750IjgQ-PYe{@4yK>A2i4*>^+63)Ff)0)hbn0L#bkKCBFY z_RVU^;`X7H8{uDwSAW1mC4i|_R;a#PF?zHhCtM^KUJbzPT1!H;{Do4TGdb$O_zdI) z&)`#_xDid0u3UwgkBcx!P&3KlGe;xATp9;4Y@x3W)km>PTK*nuCR^1QvQsHu3XRJX zj$Un*8wuma(teOlKzdRtP^`f|qmI|24UUnPeFhYy2q-b?r*b-GeMI9Y-H43+R&x)2 z4PS0BUPrq%%-rRz9|OPI3ijDEBayYiCf&|UAlU6{+S}k-wrflPH&YI*JwqS2OXTF7 zI%}YdlD8jgEBC}P@Vw9XKXKqc$o*Ll8n?@B9+$(RY^~k)ccdGm{Q`mk01c}V`?fk0 zmIyX~>5KVBw>JZK+O!hpW>n63%--?kCSmHY8R(TnN61w@A_EwEVq9MAEPO$D(PZw6O=l1BL7qN(2K4W^r(+xtE<@NqLpvdtQbMxM!xHUIs+Q> z5hFhdQ;p@XD4BX1$<23p)AZ#9BLX|XT&Bw4u3jW2JUZhTP`{#otfm%X+~L_6N+Xa} zsvG0#ioNs%pocHiOVMU^m$nFfPO6`llov6`xuZA$brdaeIeJ>{{i##8G6N`7c> zu1q|E`n<1q^*P@G;c)rICzu9oEy^#lcly-lf`I>muJ1Y-lYB1$4d_R+F0~lRvgsWP zX?;k6TY~yM4`?lTsepNn_CxEwecw;ov1)^ws!p24XWD;@^Uo8_83KX<0RV$8HW*(R zW;zpt%TdG3(6&J0(m%mEUSLL{x^*>$Vi=?NnFrb(*|@V2<{01`WXviA<&~ITq~M6m zP2v)Gx$u7G>6zdYv>PmVr*FuUYp>K5?)%}JGvvs5;bv$UbkWr9jmIf@kpqC)BLMEv zhtZYVC*|JgYJ)>36@0KgMfO&0o0|j|o%MaejgwvjrUc!dq)<)*vT%qFNPSdUbvW?PX