diff --git a/Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc b/Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc index df71d16f..5b18b705 100644 --- a/Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc +++ b/Platforms/SurfaceDuo1Pkg/SurfaceDuo1.dsc @@ -32,13 +32,13 @@ DEFAULT_KEYS = TRUE PK_DEFAULT_FILE = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-PK.der KEK_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/MicCorKEKCA2011_2011-06-24.der - KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der + KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der KEK_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-KEK.der DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicWinProPCA2011_2011-10-19.der - DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der + DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der DB_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicCorUEFCA2011_2011-06-27.der - DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der - DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der + DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der + DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/Artifacts/Aarch64/DefaultDbx.bin PEI_CRYPTO_SERVICES = NONE diff --git a/Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc b/Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc index 6ed00e89..c89104df 100644 --- a/Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc +++ b/Platforms/SurfaceDuo1Pkg/SurfaceDuo1NoSb.dsc @@ -32,13 +32,13 @@ DEFAULT_KEYS = FALSE PK_DEFAULT_FILE = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-PK.der KEK_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/MicCorKEKCA2011_2011-06-24.der - KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der + KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der KEK_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-KEK.der DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicWinProPCA2011_2011-10-19.der - DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der + DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der DB_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicCorUEFCA2011_2011-06-27.der - DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der - DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der + DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der + DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/Artifacts/Aarch64/DefaultDbx.bin PEI_CRYPTO_SERVICES = NONE diff --git a/Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc b/Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc index cd119bf4..1dfb633b 100644 --- a/Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc +++ b/Platforms/SurfaceDuo2Pkg/SurfaceDuo2.dsc @@ -32,13 +32,13 @@ DEFAULT_KEYS = TRUE PK_DEFAULT_FILE = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-PK.der KEK_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/MicCorKEKCA2011_2011-06-24.der - KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der + KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der KEK_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-KEK.der DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicWinProPCA2011_2011-10-19.der - DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der + DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der DB_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicCorUEFCA2011_2011-06-27.der - DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der - DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der + DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der + DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/Artifacts/Aarch64/DefaultDbx.bin PEI_CRYPTO_SERVICES = NONE diff --git a/Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc b/Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc index b0632575..d9b49f62 100644 --- a/Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc +++ b/Platforms/SurfaceDuo2Pkg/SurfaceDuo2NoSb.dsc @@ -32,13 +32,13 @@ DEFAULT_KEYS = FALSE PK_DEFAULT_FILE = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-PK.der KEK_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/MicCorKEKCA2011_2011-06-24.der - KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der + KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der KEK_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-KEK.der DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicWinProPCA2011_2011-10-19.der - DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der + DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der DB_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicCorUEFCA2011_2011-06-27.der - DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der - DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der + DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der + DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/Artifacts/Aarch64/DefaultDbx.bin PEI_CRYPTO_SERVICES = NONE diff --git a/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der b/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der similarity index 100% rename from Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der rename to Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der diff --git a/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der b/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der similarity index 100% rename from Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der rename to Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der diff --git a/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der b/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der similarity index 100% rename from Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der rename to Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der diff --git a/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der b/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der similarity index 100% rename from Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der rename to Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der diff --git a/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/keystore.toml b/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/keystore.toml index 67cb09e6..cd356779 100644 --- a/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/keystore.toml +++ b/Platforms/SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/keystore.toml @@ -90,7 +90,7 @@ sha1 = 0x31590bfd89c9d74ed087dfac66334b3931254b30 signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" [[DefaultKek.files]] -path = "keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der" +path = "keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der" url = "https://go.microsoft.com/fwlink/?linkid=2239775" sha1 = 0x459ab6fb5e284d272d5e3e6abc8ed663829d632b signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" @@ -117,7 +117,7 @@ sha1 = 0x580a6f4cc4e4b669b9ebdc1b2b3e087b80d0678d signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" [[DefaultDb.files]] -path = "keystore/DB/Certificates/windows uefi ca 2023.der" +path = "keystore/DB/Certificates/windows_uefi_ca_2023.der" url = "https://go.microsoft.com/fwlink/?linkid=2239776" sha1 = 0x45a0fa32604773c82433c3b7d59e7466b3ac0c67 signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" @@ -135,7 +135,7 @@ sha1 = 0x580a6f4cc4e4b669b9ebdc1b2b3e087b80d0678d signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" [[Default3PDb.files]] -path = "keystore/DB/Certificates/windows uefi ca 2023.der" +path = "keystore/DB/Certificates/windows_uefi_ca_2023.der" url = "https://go.microsoft.com/fwlink/?linkid=2239776" sha1 = 0x45a0fa32604773c82433c3b7d59e7466b3ac0c67 signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" @@ -147,13 +147,13 @@ sha1 = 0x46def63b5ce61cf8ba0de2e6639c1019d0ed14f3 signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" [[Default3PDb.files]] -path = "keystore/DB/Certificates/microsoft uefi ca 2023.der" +path = "keystore/DB/Certificates/microsoft_uefi_ca_2023.der" url = "https://go.microsoft.com/fwlink/?linkid=2239872" sha1 = 0xb5eeb4a6706048073f0ed296e7f580a790b59eaa signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" [[Default3PDb.files]] -path = "keystore/DB/Certificates/microsoft option rom uefi ca 2023.der" +path = "keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der" url = "http://www.microsoft.com/pkiops/certs/microsoft%20option%20rom%20uefi%20ca%202023.crt" sha1 = 0x3FB39E2B8BD183BF9E4594E72183CA60AFCD4277 signature_owner = "77fa9abd-0359-4d32-bd60-28f4e78f784b" diff --git a/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamilyPkg.dec b/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamilyPkg.dec index be36d55e..214ccfac 100644 --- a/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamilyPkg.dec +++ b/Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamilyPkg.dec @@ -7,13 +7,13 @@ DEFAULT_KEYS = TRUE PK_DEFAULT_FILE = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-PK.der KEK_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/MicCorKEKCA2011_2011-06-24.der - KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft corporation kek 2k ca 2023.der + KEK_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/KEK/Certificates/microsoft_corporation_kek_2k_ca_2023.der KEK_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/OEMA0-KEK.der DB_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicWinProPCA2011_2011-10-19.der - DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows uefi ca 2023.der + DB_DEFAULT_FILE2 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/windows_uefi_ca_2023.der DB_DEFAULT_FILE3 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/MicCorUEFCA2011_2011-06-27.der - DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft uefi ca 2023.der - DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft option rom uefi ca 2023.der + DB_DEFAULT_FILE4 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_uefi_ca_2023.der + DB_DEFAULT_FILE5 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/keystore/DB/Certificates/microsoft_option_rom_uefi_ca_2023.der DBX_DEFAULT_FILE1 = SurfaceDuoFamilyPkg/Include/Resources/SecureBoot/Artifacts/Aarch64/DefaultDbx.bin DXE_CRYPTO_SERVICES = STANDARD