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.

ac0a286f4d

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Naveen Saini 2022-03-02 12:07:21 +08:00 committed by Anuj Mittal
parent efaeab8155
commit c43a7b5900
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
From 149b34de80e7f9f5331c285b862776cdd4b02ee3 Mon Sep 17 00:00:00 2001 From b2099e7184d48a6d05c8713b6fd5dac0e2e70963 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: Wed, 2 Mar 2022 10:55:35 +0800
Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot
This patch adds refkit-db.cer (via xxd -i) in OVMF's db This patch adds refkit-db.cer (via xxd -i) in OVMF's db
@ -10,22 +10,18 @@ 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>
Signed-off-by: Naveen Saini <naveen.kumar.saini@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/AuthData.c | 68 +++++++++++++++++++ OvmfPkg/EnrollDefaultKeys/AuthData.c | 69 +++++++++++++++++++
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1 + OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 3 +
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h | 2 + OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h | 2 +
3 files changed, 71 insertions(+) 3 files changed, 74 insertions(+)
diff --git a/OvmfPkg/EnrollDefaultKeys/AuthData.c b/OvmfPkg/EnrollDefaultKeys/AuthData.c diff --git a/OvmfPkg/EnrollDefaultKeys/AuthData.c b/OvmfPkg/EnrollDefaultKeys/AuthData.c
index 3b4856a01f..7109766296 100644 index 53ee7f7003..127131cd05 100644
--- a/OvmfPkg/EnrollDefaultKeys/AuthData.c --- a/OvmfPkg/EnrollDefaultKeys/AuthData.c
+++ b/OvmfPkg/EnrollDefaultKeys/AuthData.c +++ b/OvmfPkg/EnrollDefaultKeys/AuthData.c
@@ -398,6 +398,74 @@ CONST UINT8 mMicrosoftUefiCa[] = { @@ -395,6 +395,75 @@ CONST UINT8 mMicrosoftUefiCa[] = {
CONST UINTN mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa; CONST UINTN mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;
@ -97,26 +93,29 @@ index 3b4856a01f..7109766296 100644
+}; +};
+ +
+CONST UINTN mSizeOfRefkitTestCA = sizeof mRefkitTestCA; +CONST UINTN mSizeOfRefkitTestCA = sizeof mRefkitTestCA;
+
// //
// The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case // The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case
// of the Secure Boot Logo Test in the Microsoft Hardware Certification Kit
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
index f45cb799f7..fb1252e768 100644 index 094e4c821b..0a7eef54dc 100644
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
@@ -615,6 +615,7 @@ ShellAppMain ( @@ -702,6 +702,9 @@ ShellAppMain (
&gEfiCertX509Guid, mMicrosoftUefiCa,
mMicrosoftPca, mSizeOfMicrosoftPca, &gMicrosoftVendorGuid, mSizeOfMicrosoftUefiCa,
mMicrosoftUefiCa, mSizeOfMicrosoftUefiCa, &gMicrosoftVendorGuid, &gMicrosoftVendorGuid,
+ mRefkitTestCA, mSizeOfRefkitTestCA, &gEfiCallerIdGuid, + mRefkitTestCA,
NULL); + mSizeOfRefkitTestCA,
+ &gEfiCallerIdGuid,
NULL
);
} }
if (EFI_ERROR (Status)) {
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
index 8e61f0a77b..e3fa046f95 100644 index 56da9c71d6..8de1dfe4e0 100644
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
@@ -135,4 +135,6 @@ extern CONST UINTN mSizeOfMicrosoftUefiCa; @@ -133,4 +133,6 @@ extern CONST UINTN mSizeOfMicrosoftUefiCa;
extern CONST UINT8 mSha256OfDevNull[]; extern CONST UINT8 mSha256OfDevNull[];
extern CONST UINTN mSizeOfSha256OfDevNull; extern CONST UINTN mSizeOfSha256OfDevNull;
@ -124,5 +123,5 @@ index 8e61f0a77b..e3fa046f95 100644
+extern CONST UINTN mSizeOfRefkitTestCA; +extern CONST UINTN mSizeOfRefkitTestCA;
#endif /* ENROLL_DEFAULT_KEYS_H_ */ #endif /* ENROLL_DEFAULT_KEYS_H_ */
-- --
2.21.0 2.17.1