rpms/edk2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update EnrollDefaultKeys patch (bz #1398743)

Browse Source
This commit is contained in:
Cole Robinson 2017-02-16 14:15:14 -05:00
parent b9b16bb3b3
commit ed852eca75
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
View File

@ -1,3 +1,4 @@
From da502f7cc283055a65ab3caeaa62eb5c6a6fddb5 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com> From: Laszlo Ersek <lersek@redhat.com>
Date: Mon, 6 Jul 2015 20:22:02 +0200 Date: Mon, 6 Jul 2015 20:22:02 +0200
Subject: [PATCH] OvmfPkg: EnrollDefaultKeys: application for enrolling default Subject: [PATCH] OvmfPkg: EnrollDefaultKeys: application for enrolling default
@ -43,21 +44,21 @@ DB:
Contributed-under: TianoCore Contribution Agreement 1.0 Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
--- ---
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 960 ++++++++++++++++++++++++ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 963 ++++++++++++++++++++++++
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 51 ++ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 51 ++
OvmfPkg/OvmfPkgIa32.dsc | 4 + OvmfPkg/OvmfPkgIa32.dsc | 4 +
OvmfPkg/OvmfPkgIa32X64.dsc | 4 + OvmfPkg/OvmfPkgIa32X64.dsc | 4 +
OvmfPkg/OvmfPkgX64.dsc | 4 + OvmfPkg/OvmfPkgX64.dsc | 4 +
5 files changed, 1023 insertions(+) 5 files changed, 1026 insertions(+)
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
new file mode 100644 new file mode 100644
index 0000000..081212b index 0000000..447288f
--- /dev/null --- /dev/null
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
@@ -0,0 +1,960 @@ @@ -0,0 +1,963 @@
+/** @file +/** @file
+ Enroll default PK, KEK, DB. + Enroll default PK, KEK, DB.
+ +
@ -723,6 +724,8 @@ index 0000000..081212b
+ UINT8 *Data; + UINT8 *Data;
+ UINT8 *Position; + UINT8 *Position;
+ +
+ Status = EFI_SUCCESS;
+
+ // + //
+ // compute total size first, for UINT32 range check, and allocation + // compute total size first, for UINT32 range check, and allocation
+ // + //
@ -800,10 +803,11 @@ index 0000000..081212b
+ +
+ RepeatingHeader = (REPEATING_HEADER *)Position; + RepeatingHeader = (REPEATING_HEADER *)Position;
+ CopyGuid (&RepeatingHeader->SignatureType, &gEfiCertX509Guid); + CopyGuid (&RepeatingHeader->SignatureType, &gEfiCertX509Guid);
+ RepeatingHeader->SignatureListSize = sizeof *RepeatingHeader + CertSize; + RepeatingHeader->SignatureListSize =
+ (UINT32)(sizeof *RepeatingHeader + CertSize);
+ RepeatingHeader->SignatureHeaderSize = 0; + RepeatingHeader->SignatureHeaderSize = 0;
+ RepeatingHeader->SignatureSize = + RepeatingHeader->SignatureSize =
+ sizeof RepeatingHeader->SignatureOwner + CertSize; + (UINT32)(sizeof RepeatingHeader->SignatureOwner + CertSize);
+ CopyGuid (&RepeatingHeader->SignatureOwner, OwnerGuid); + CopyGuid (&RepeatingHeader->SignatureOwner, OwnerGuid);
+ Position += sizeof *RepeatingHeader; + Position += sizeof *RepeatingHeader;
+ +
@ -1076,10 +1080,10 @@ index 0000000..ac919bb
+ UefiLib + UefiLib
+ UefiRuntimeServicesTableLib + UefiRuntimeServicesTableLib
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index fa9661c..e2e6ba3 100644 index 8af3267..6fb5c9c 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc --- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -764,6 +764,10 @@ @@ -749,6 +749,10 @@
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@ -1091,10 +1095,10 @@ index fa9661c..e2e6ba3 100644
OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/PlatformDxe/Platform.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 667584a..a0ae1aa 100644 index 4bb38d0..e5abaff 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc --- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -773,6 +773,10 @@ @@ -758,6 +758,10 @@
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@ -1106,10 +1110,10 @@ index 667584a..a0ae1aa 100644
OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/PlatformDxe/Platform.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 5ae8469..87cee52 100644 index be3aa1f..4c36a7d 100644
--- a/OvmfPkg/OvmfPkgX64.dsc --- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -771,6 +771,10 @@ @@ -756,6 +756,10 @@
!if $(SECURE_BOOT_ENABLE) == TRUE !if $(SECURE_BOOT_ENABLE) == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
@ -1120,3 +1124,6 @@ index 5ae8469..87cee52 100644
!endif !endif
OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/PlatformDxe/Platform.inf
--
1.8.3.1

5
edk2.spec
View File

@ -4,7 +4,7 @@
Name: edk2 Name: edk2
Version: %{edk2_date}git%{edk2_githash} Version: %{edk2_date}git%{edk2_githash}
Release: 1%{dist} Release: 2%{dist}
Summary: EFI Development Kit II Summary: EFI Development Kit II
Group: Applications/Emulators Group: Applications/Emulators
@ -305,6 +305,9 @@ cp -a arm %{buildroot}/usr/share/%{name}
%changelog %changelog
* Thu Feb 16 2017 Cole Robinson <crobinso@redhat.com> - 20170209git296153c5-2
- Update EnrollDefaultKeys patch (bz #1398743)
* Mon Feb 13 2017 Paolo Bonzini <pbonzini@redhat.com> - 20170209git296153c5-1 * Mon Feb 13 2017 Paolo Bonzini <pbonzini@redhat.com> - 20170209git296153c5-1
- Rebase to git master - Rebase to git master
- New patch 0010 fixes failure to build from source. - New patch 0010 fixes failure to build from source.