MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ovmf: refresh patch

Browse Source 
Refresh patch as per the latest version in OE-Core. Move the key as per:

a79b115ade

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2019-08-13 09:03:26 +08:00
parent dc83ce1bfe
commit 50721b67a9
1 changed files with 111 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
View File

@ -1,4 +1,4 @@
From 48e511481d83c1614cd00a5a2edcf6b5d746b9c4 Mon Sep 17 00:00:00 2001 From 149b34de80e7f9f5331c285b862776cdd4b02ee3 Mon Sep 17 00:00:00 2001
From: Mikko Ylinen <mikko.ylinen@linux.intel.com> From: Mikko Ylinen <mikko.ylinen@linux.intel.com>
Date: Fri, 7 Apr 2017 12:06:14 +0300 Date: Fri, 7 Apr 2017 12:06:14 +0300
Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot
@ -10,19 +10,26 @@ application. It's used for testing purposes only.
Images signed with refkit-db keys are allowed to boot. Images signed with refkit-db keys are allowed to boot.
Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com>
[ Change location of key to AuthData.c ]
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
%% original patch: 0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
--- ---
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 68 +++++++++++++++++++++++++++ OvmfPkg/EnrollDefaultKeys/AuthData.c | 68 +++++++++++++++++++
1 file changed, 68 insertions(+) OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1 +
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h | 2 +
3 files changed, 71 insertions(+)
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c diff --git a/OvmfPkg/EnrollDefaultKeys/AuthData.c b/OvmfPkg/EnrollDefaultKeys/AuthData.c
index 24ab977..a3c12ba 100644 index 3b4856a01f..7109766296 100644
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c --- a/OvmfPkg/EnrollDefaultKeys/AuthData.c
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c +++ b/OvmfPkg/EnrollDefaultKeys/AuthData.c
@@ -516,6 +516,73 @@ STATIC CONST UINT8 MicrosoftUefiCA[] = { @@ -398,6 +398,74 @@ CONST UINT8 mMicrosoftUefiCa[] = {
0x07, 0x92, 0x9b, 0xf5, 0xa6, 0xbc, 0x59, 0x83, 0x58
};
+STATIC CONST UINT8 RefkitTestCA[] = { CONST UINTN mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;
+CONST UINT8 mRefkitTestCA[] = {
+ 0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01, + 0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01,
+ 0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac, + 0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac,
+ 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, + 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
@ -89,17 +96,33 @@ index 24ab977..a3c12ba 100644
+ 0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3 + 0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3
+}; +};
+ +
// +CONST UINTN mSizeOfRefkitTestCA = sizeof mRefkitTestCA;
// The most important thing about the variable payload is that it is a list of
// lists, where the element size of any given *inner* list is constant. //
@@ -908,6 +975,7 @@ ShellAppMain ( // The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case
&gEfiImageSecurityDatabaseGuid, diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
MicrosoftPCA, sizeof MicrosoftPCA, &gEfiCallerIdGuid, index f45cb799f7..fb1252e768 100644
MicrosoftUefiCA, sizeof MicrosoftUefiCA, &gEfiCallerIdGuid, --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
+ RefkitTestCA, sizeof RefkitTestCA, &gEfiCallerIdGuid, +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
NULL); @@ -615,6 +615,7 @@ ShellAppMain (
if (EFI_ERROR (Status)) { &gEfiCertX509Guid,
return 1; mMicrosoftPca, mSizeOfMicrosoftPca, &gMicrosoftVendorGuid,
-- mMicrosoftUefiCa, mSizeOfMicrosoftUefiCa, &gMicrosoftVendorGuid,
2.1.4 + mRefkitTestCA, mSizeOfRefkitTestCA, &gEfiCallerIdGuid,
NULL);
}
if (EFI_ERROR (Status)) {
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
index 8e61f0a77b..e3fa046f95 100644
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
@@ -135,4 +135,6 @@ extern CONST UINTN mSizeOfMicrosoftUefiCa;
extern CONST UINT8 mSha256OfDevNull[];
extern CONST UINTN mSizeOfSha256OfDevNull;
+extern CONST UINT8 mRefkitTestCA[];
+extern CONST UINTN mSizeOfRefkitTestCA;
#endif /* ENROLL_DEFAULT_KEYS_H_ */
--
2.21.0