From 7a2e5b67b9033b9fc3908d791cb338153a2423aa Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <schowdhury@microsoft.com>
Date: Fri, 8 Dec 2023 15:58:50 +0530
Subject: [PATCH] fix

Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
---
 .../coreos-sb-keys-0.0.2.ebuild               |   5 ++++-
 .../coreos-base/coreos-sb-keys/files/DB.der   | Bin 777 -> 0 bytes
 .../coreos-base/coreos-sb-keys/files/DB.pem   |  19 ------------------
 .../coreos-sb-keys/files/flatcar-stg-ca.der}  | Bin
 .../coreos-sb-keys/files/flatcar-stg-ca.key}  |   0
 .../coreos-sb-keys/files/flatcar-stg-ca.pem}  |   0
 .../sys-boot/shim/shim-9999.ebuild            |   2 +-
 7 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.der
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.pem
 rename sdk_container/src/third_party/coreos-overlay/{sys-boot/shim/files/shim.der => coreos-base/coreos-sb-keys/files/flatcar-stg-ca.der} (100%)
 rename sdk_container/src/third_party/coreos-overlay/{sys-boot/shim/files/shim.rsa => coreos-base/coreos-sb-keys/files/flatcar-stg-ca.key} (100%)
 rename sdk_container/src/third_party/coreos-overlay/{sys-boot/shim/files/shim.pem => coreos-base/coreos-sb-keys/files/flatcar-stg-ca.pem} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild
index cc8a4ffefe..f2933ee722 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/coreos-sb-keys-0.0.2.ebuild
@@ -21,5 +21,8 @@ src_install() {
 	newins "${FILESDIR}/KEK.crt" KEK.crt
 	newins "${FILESDIR}/DB.key" DB.key
 	newins "${FILESDIR}/DB.crt" DB.crt
-	newins "${FILESDIR}/DB.der" DB.der
+  newins "${FILESDIR}/ca.key" ca.key
+  newins "${FILESDIR}/ca.der" ca.der
+  newins "${FILESDIR}/ca.pem" ca.pem
+  newins "
 }
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.der b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.der
deleted file mode 100644
index 2ec1eaf3c3f8dd2712cd9bb7947131380abaa6b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 777
zcmXqLVrDgHVtl)RnTe5!iIZV#n2$+d`9^gEUN%mxHjlRNyo`+8tPBQ{hT;aIY|No7
z%shO~`9-Pz!3rg*#U%<ZP6l$~yoRO*CWgj_7RJUVW>H|SDV&Q>YZIdqvPF!n49rc8
z{0u+`aWOS9GBRv%YT-Td@oSa-L=$(znK%CwD98M}Ccb0yY(~eoe)AnxsA;pgC5g`6
z>6X2?F3GuMoxII`(`}QTE-va?zc(a_UHN+D3%TS4?pN~fZ7Dn;G5cQKCGD2vc~f_V
zr%mK-&bT1>?OCM#lk*(HOQv5`(vyxpB)a-Q|7?>ozM_JUPxx#jmhN2dy!`cocBjzV
z`yN*>HGH$Vo+y2PP4CHxMY*p7c1^$PcCsYv!4xyuTXQa*=ZLy@tu20<PhD_<Ym8aR
z<b%nppMT!7Chy_%zj4#j;?!3hp2l?WWs^&H>d)Vfl?nf?OkbE51a8v!?r>v2x74}k
z7amQDa$6L9i!;Dv!89@bsZS#M?=mqnGB7R<Fz_>w1%|yWABz}^NSY1*2e#wKlndE!
zfBhN#W!=GEUuy$-khC(3gn?KCb_F~j1;Q+>2F#3%|B=HS7`ebOXJnZ6)$FB|;QEx$
zPxD>BJZHTz-)KtEx+!-$3ne2I4;kGPUVlQ7``Y~1s_)|cO;;>G^FjD{#Lc%Y6J-si
zw_U$I=X{ug^3;EFqUUZ`r)TbZ#&GNRzpD3FGaY}ulAa~{CL*sW`H{i3N2l-35TCM`
z{o^y&CG)$|H{6w6ZW$^UtTOG*9qTQ8DcL`dUGz_ky}S3d-Gi2ykxsT*zTMeZdpGTG
z5$Y7}O+6H3weIiMi?bPKEm@`Z;{Co5`PIsQ-H#hJT=4rKHz%I`e`C$1{k!6`66V%d
zbxA9#Co{xyKFrzl%<k&*e^X0u=Ok_ZTm4?^UhV4RqE@937T=!h>vhk3T3ge})^<tF
G@?rpVkxPXD

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.pem
deleted file mode 100644
index e621892143..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/DB.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDBTCCAe2gAwIBAgIJALVWTDRRd7EnMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
-BAMMDkNvcmVPUyB0ZXN0IERCMB4XDTE1MDQxMzE4MzM0NloXDTE1MDUxMzE4MzM0
-NlowGTEXMBUGA1UEAwwOQ29yZU9TIHRlc3QgREIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCwQoQNxPH1ei+RNEcxmdn8cCNc/tYXuLObAUHtTp9AqCYr
-BkZiFZ25RmujfmJDdK4fPN81tpNC0aKKr71UYgcj13noHmOgR9Rv3rRxwBib3n7S
-K4RjnpW6V2aRDYNo0BH25lk/5M8IE6SX0SIuG1vCFavAj5s0dg5ycPHkDj1Ypbmv
-Q6froIdCVX3fSNXSgPY812Eb36yNyZFybetQupfVRsl0auCUNh3anNLPCFre1oZf
-lkx+U3BFXDZ0k8Fjq+fzvKxu4ef9XpZmXieow5YCwemCRItl+ftBeWD/OjXoNXBR
-sij3QNi/CxrO59DiklpGolPaCVA0oJYWL5XkWI/dAgMBAAGjUDBOMB0GA1UdDgQW
-BBRmPA/wBsfGI3EH2/X5W/SuwY1NOzAfBgNVHSMEGDAWgBRmPA/wBsfGI3EH2/X5
-W/SuwY1NOzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCW9TbpGhGv
-ZPPlb0X05wXYnzKUUq6U3IlxGVghwjLeE6/IIQvWn+sl7l9PNainzPATx1jZ7YSR
-HTCXhtfbnM9WICOV/h4Vztt7Z2m65gDa+/5679VpQfrqG5oV7FhucmPiMNbiy92Y
-F5SjB/HmRaSfimew3RmnOVUeUySW7Nw7tA5ka/nG0U9hXd296z7ghJlZQj1qTYtr
-1Y2yv4QSiRWNZcJSOq79tdGbAJqkqibo775UH6sj/UfHMoDQTvAenF8H/4F80r+6
-X2pgnX96ihshJ2MAXQnhbLLmPtXn/pV122xis/177yrefavHFTp14KPbnU1K3jeW
-hoLJhYcZKXdz
------END CERTIFICATE-----
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/files/shim.der b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.der
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/shim/files/shim.der
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.der
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/files/shim.rsa b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.key
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/shim/files/shim.rsa
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.key
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/files/shim.pem b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.pem
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-boot/shim/files/shim.pem
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-sb-keys/files/flatcar-stg-ca.pem
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
index 2ee87857e1..0b82ae152b 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/shim/shim-9999.ebuild
@@ -55,7 +55,7 @@ src_compile() {
 		emake_args+=( ARCH=aarch64 )
 	fi
   emake_args+=( ENABLE_SBSIGN=1 )
-  emake_args+=( VENDOR_CERT_FILE="${SYSROOT}/usr/share/sb_keys/shim.der" )
+  emake_args+=( VENDOR_CERT_FILE="${FILESDIR}/shim.der" )
 	emake "${emake_args[@]}" || die
 }