From c466cc2ca5d0e935bfaa6f6f4ab594a0c242e84b Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Tue, 7 Mar 2023 15:51:00 -0700
Subject: [PATCH] Add System76 Secure Boot keys

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 .../keys/db-system76.crt                       | Bin 0 -> 875 bytes
 .../keys/{kek.crt => kek-microsoft.crt}        | Bin
 .../keys/kek-system76.crt                      | Bin 0 -> 883 bytes
 .../SecureBootEnrollDefaultKeys/keys/pk.crt    | Bin 1053 -> 875 bytes
 UefiPayloadPkg/UefiPayloadPkg.fdf              |   4 +++-
 5 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/db-system76.crt
 rename UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/{kek.crt => kek-microsoft.crt} (100%)
 create mode 100644 UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-system76.crt

diff --git a/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/db-system76.crt b/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/db-system76.crt
new file mode 100644
index 0000000000000000000000000000000000000000..2f5285bcf1e6019e3fac342b3377787151cd1387
GIT binary patch
literal 875
zcmXqLVoo<`V)ADav8tMKerH?nol6s0mAnIdLpJ`rWMRO|#;Mij(e|B}k&&B~!Jxp9
z+klgeIh2J>m?<>aP|$!M#NpuKaL&)kFG@_wH{=Iu0SdA6u(_n>m8BNJ)Nt`|1XmW9
zq~@BN8EP45fYdPaD8hskf>V=Ai&7Pw^7Bg+ToOwXlM;(l6}(d`4dldmjf@QpjSUS=
zfuwPiIIl5~Yh(fC4uFfA7?qHNg^`tkxrvdV!Jvtei>Zl`kzq%Dm~`v6-1ELV_3{&q
z=jH$F{9$pSE^^DBJ0e2+b*@iwUn0QGIa#K3^~o95DjHs&zb5b8!m9gOIo#Sjh>z1K
z#6M%p711=!h`C30pZoW0|8z0830y%te=b<PTwe3qgWj9bI|DeD9_VM%VVJt(G0)St
zKdn<&i``^2y}9zn=Xs$@&Ck=WX;~y%3M{zzNXglUtAKHGy+=Xt`3;ZtuOD3Jc}8Es
z%k}M)n(X-}HzrPxKY1i}(VxDwLtN$M3}<Kl?Fo&Y);c$$l3VPZqu3r9jaF+>%aA<B
zSDiCt3#{sH1iWDTGDE~TtAEe)35BK~tB!haNbTG3=dp~`=ZCz4w=GK6XdYk8#LURR
zh#W$|gaZsAMurLVq@GP$=(DBo^?Lpvbuw%sd^el5I{*FXFn+P_!n?A?6$>)oY;-nP
z*RDLRxi=$E#nR5<R!|JPqm$A9@J;V8%yx8N<=glreJA4@zP3}PRsUGH{wR4Yy}f&u
zz!oQkpxJI)98WNGH$7W*<>iL$aetlT$|n1N^q&x=d0=5uc4YCoh4vRVaut-;zAZhu
zcy0KUQ|rzC%(=}e##zey;91!{_8*T!uWrmRSkrA>s^<1XZ0FME@5e$!)-K*U=~`T9
zS+?yC?vT9S=EX(fuRTIi9p3iu{$il9fPKZvjS;K-Bcz#IRgGOM4)*I`y~FjZM9cb-
YSM;%Gcim0%%X<^*US(X3c>m@B00hENoB#j-

literal 0
HcmV?d00001

diff --git a/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek.crt b/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-microsoft.crt
similarity index 100%
rename from UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek.crt
rename to UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-microsoft.crt
diff --git a/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-system76.crt b/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-system76.crt
new file mode 100644
index 0000000000000000000000000000000000000000..ceb5d96fdb3e6d49ff8d5e5005bd16ad6418eafc
GIT binary patch
literal 883
zcmXqLV$L^cVhU#x@%Xqq^zyst{y23G^9YZ-|4*76oMgbu#;Mij(e|B}k&&B~!Jx#D
z+klgeIh2J>m?<>aP|$!M#NpuKaL&)kFG@_wH{=Iu0SdA6u(_n>m8BNJ)Nt`|1XmW9
zq~@BN8R{A6fYdPasKSI4f>V=Ai&7Pw^7Bg+yi+R`Tq}|@67$kiK^y})ab6>114Cm&
zLsKAW93{?c4CESFK)D0tswPGy<ltdsWngY%<YzEwV&r0KVq|2PRm8P2`>@ri|MQoh
z{d?wLly|7o@&{E9WHQrI%!4kLA1X-vFK%)=FJJMcy;Z-b>sOX&^GUUukG!Wcg(mKK
zX;l*(cd@nFzrd3%pVRWbTYibl+;3fdT$@*=Evo47HP%;YjI_*hTVVR<ZJ&Kr)LE|<
zfBA^(T*(_7zh?4=>23PKDiy=!G~G=kbN}UQUO)XK{TQ|{6TY<UwC2orYiC|xuzia1
z_wXCNf4INw{NLu&X|lt4vf84k@AiH?XB7jB;zgU{B)RW)t&LmTS66U6MKeac_~<|L
zwLUUinkKV0n98?&Up=|6x~6LTJ-z?V`vn$M9hi07qP~&$z*M_JPxH#nJ0v`rm>C%u
zkwXZWfPf*y$WYAg?R)WH(UX8(cbSXq;*#~7osP=g<qqdAy}nmEFmbMlvIX-ddGT6K
zyYIo=Oh3}I&h`ABy<cj@y({_8ZP>rXtqQR1UVF{7`jz&rUp^by6_%X+GROGbGK;xs
ztFxw_*kcgkJV`9;)HFY78;12hin*oT9xFXM9H*Jt{(rh*pOx%!e<6t;4PK|(Hl;7h
zOOCVLuvvI^Y3-j6cfQK(b_-#AbYgMT)_cBH>lR)~-t<*a>wSw%%&m=6R`!{^*mBvw
zXbtO@V>1q2+B_q0Y1#$(8_Zjuo;W1WnNZ}`8^oshbjNW^$D$L5H$UjtSh;Fj?X{o?
Yr&*y1K0DUDDcPgI?&EdxM9j5W07+v`%>V!Z

literal 0
HcmV?d00001

diff --git a/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/pk.crt b/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/pk.crt
index a374b28a5ee19fbb586a3289e5d6efb94e3850f4..64f6046aee73954a725d3b578c6c4e6aeefea25a 100644
GIT binary patch
literal 875
zcmXqLVoo<`V)ADa5zjwpcyHDMp)LFsqV3@|>vVVBQ8VCW<J4;NX#38~$jHsgU{GMl
zZNSOK9LmBb%oG}IC}_YB;&AYAIOpf&7bT|T8}b9S0EO6j*j!Tc%2JD9YPfhff-8$l
zQghAC47Ch2Kx&wI6k$RN!KulmMX3r-`S~RZ0Xc~!Y57ID3f`%e26E!OM#ct)#)gKb
zK+-5moYxr0HL`$m2f#&5j7rGC!pO?N+{DPwV9><K#ni;e$gr<4o3&MNR){up$-<MJ
zJsPi!%rdWU@}9D$uPC`{x5R4JjM~Qi(wg7PA9Lj1WaN`qdcRukR8m{^*CkDwc~cg0
z_^rOT<n(lZ-Gxp(Jj`akPi`(f`gxU7=f^2C0x#~1RGuE}e?zj$N`v)Dx77}j7fw7c
zG(KJ9*fvvY`=&Cf>n?`H*K1Qbk3W@DmMeU=sP%f@?HlVKigbHx6m37UoM~RU)jZ8?
z<_izM#Pg*t+wQMhA<?+e(V$|n+R_F_wI-w5Emz*IN&Tdple+JGYA{a?v%Y`FB7S#?
z?(Hd^r7t8{*MI$Zf8ODA={2h6YY(2(e5ftgcHYI}nfz)I-ev9Keii!b?{G3PGcqtD
zhY&E~07Hn8K_|gHX+y-H1xj7&2Yn>|PoDThx%9z<y@#sqUpg%&ADiOowm*o!sMyx`
z^QYgh+>~-YU6^-dqs!hOmo&E*A2KelP(0Bo_gwjO#GE^AnU@@Lck#Wld?T|}aa-p$
zhK+|8&eYr+6?@6)k!?|d)pg6jwNt|`&U<R7S)!h|@TkVYLo5qJ?;E_my{V4FR({4)
zsjP?Yyz?!0CRZQZ!`zm?`CmuG>&Hz?{yORH+07EB78QE)Mb~!zSA5cHvbteCb7!q6
zKP1`Gw|e(PvC<!({)zLHe&1fL5m;q=u2$>#hEpcfd}oWAF0f7NyR&oi)(g_dpNK79
Y<jvCmGs8|Nm+__jN@JsqGjx{$0O;>ZoB#j-

literal 1053
zcmXqLVv#gxVrE>x%*4pVBqAV^<z{{JS~cGVE+>xtN4hM|pMPM$%f_kI=F#?@mywa1
zmBFBKwjs9xCmVAp3!5;Li>o1z0T+nF!Ncqq6mG~5R1V~^^RPMPCufxA8p;{SfCRXB
zL@iTuQgc)DN{SU6(^K=3D;3;xlRON?3`9Wk+&sL_l}V{Z!KulmMVTd)h9U++AaQ0M
z?$Fe<OsCS!oRrieLwN&PxNA5W#RQV`^GXtvOB^gyi&K;JGV=}O#CeSj3``7+4a|&8
zO$?%dTtg)8Aa{KeqY`p(GqN%;H!<=v7&I|*F*PwVGMv07GH>nV^Cn-P*Ck9``uch4
zzsw_Pi_;$)ud!PF-TB=Y2}hF{?t@#`3og;x&20bGBb+J9k;Bk`ZB&Z)c`0+xn@zi>
z`m(AvMU?r51-?$YaBiNS`h-0vFZ_vmwNz-%cjK?`Oy(}Re6C^F)=w9-Wvdo$DVDmP
zeC7Rw3Ey8T`CglL$xOjv!LP|j1>PpuE?J@d{)9x<=DdkKfnA@n=bPQW`KH)I*!A&@
z4}D8@?+0>hUdOg{$=+Du<`c2GehFrm)xR|^v%aYid_wq1hqmT<zNAmj(%zgd3OFq}
z?@=D#<XfD+(`M$MGEcZA^3F{|bl0todq1CO5vkE_Qb{>kyy9`CW8RwBcqV2>2FAs~
z27$n2z#J;e$0Eie($q5Va`d?;jqMA0=M{gAovk6Z=YWAcNLrai!a%G6y8?cY0%1nR
z|17Kq%s>h`*nz1W80?G;Gd$PZUu!7fiM3gJ@Lp7ScxH?02G{LM5ob*r6gV%|s$R0q
zTVA2%e`dzIqpq)0Rqk91Ja?k6^zzafTp3NCzNf`kx9j+>pY`i<?@8I3Ix9zEJ#n5V
z64UjxFRs1m6np)+L%P$c+|3IVLQftuK6#$`)C{%=>DkQN3XYa9Xr8%$*C(#)!rNCn
zKjr;$y*bHJRE>GhA_nVdm1Ri>!#~ez@w;hbYawHx%Ix;GkWGE*-0xq^H6p~CUYLdV
z%(;;w9=7j3pTOP!)pchc_na(gz4vPOo+)0tf;PYI`R#OZ`Wue8^IsJw=_#LIYg#H;
e|M$d7pNB%re;RY_75|!39JRH!<;Tx2S9$?qFp2U2

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 2b41c5396d..ef639ceef7 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -260,11 +260,13 @@ INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
   }
 
   FILE FREEFORM = 6f64916e-9f7a-4c35-b952-cd041efb05a3 {
-    SECTION RAW = UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek.crt
+    SECTION RAW = UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-system76.crt
+    SECTION RAW = UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/kek-microsoft.crt
     SECTION UI = "KEK Default"
   }
 
   FILE FREEFORM = c491d352-7623-4843-accc-2791a7574421 {
+    SECTION RAW = UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/db-system76.crt
     SECTION RAW = UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/db-1.crt
     SECTION RAW = UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/db-2.crt
     SECTION UI = "DB Default"