ed852e
Update EnrollDefaultKeys patch (bz #1398743)
Authored and Committed by 
crobinso
8 years ago
0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
From da502f7cc283055a65ab3caeaa62eb5c6a6fddb5 Mon Sep 17 00:00:00 2001
|
|
1
2
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
2
3
|
Date: Mon, 6 Jul 2015 20:22:02 +0200
|
|
3
4
|
Subject: [PATCH] OvmfPkg: EnrollDefaultKeys: application for enrolling default
|
|
@@ -43,21 +44,21 @@ DB:
|
|
|
43
44
|
Contributed-under: TianoCore Contribution Agreement 1.0
|
|
44
45
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
45
46
|
---
|
|
46
|
-
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c |
|
|
47
|
+
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 963 ++++++++++++++++++++++++
|
|
47
48
|
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 51 ++
|
|
48
49
|
OvmfPkg/OvmfPkgIa32.dsc | 4 +
|
|
49
50
|
OvmfPkg/OvmfPkgIa32X64.dsc | 4 +
|
|
50
51
|
OvmfPkg/OvmfPkgX64.dsc | 4 +
|
|
51
|
-
5 files changed,
|
|
52
|
+
5 files changed, 1026 insertions(+)
|
|
52
53
|
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
|
53
54
|
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
|
54
55
|
|
|
55
56
|
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
|
56
57
|
new file mode 100644
|
|
57
|
-
index 0000000..
|
|
58
|
+
index 0000000..447288f
|
|
58
59
|
--- /dev/null
|
|
59
60
|
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
|
60
|
-
|
|
61
|
+
|
|
61
62
|
+/** @file
|
|
62
63
|
+ Enroll default PK, KEK, DB.
|
|
63
64
|
+
|
|
@@ -723,6 +724,8 @@ index 0000000..081212b
|
|
|
723
724
|
+ UINT8 *Data;
|
|
724
725
|
+ UINT8 *Position;
|
|
725
726
|
+
|
|
727
|
+
+ Status = EFI_SUCCESS;
|
|
728
|
+
+
|
|
726
729
|
+ //
|
|
727
730
|
+ // compute total size first, for UINT32 range check, and allocation
|
|
728
731
|
+ //
|
|
@@ -800,10 +803,11 @@ index 0000000..081212b
|
|
|
800
803
|
+
|
|
801
804
|
+ RepeatingHeader = (REPEATING_HEADER *)Position;
|
|
802
805
|
+ CopyGuid (&RepeatingHeader->SignatureType, &gEfiCertX509Guid);
|
|
803
|
-
+ RepeatingHeader->SignatureListSize =
|
|
806
|
+
+ RepeatingHeader->SignatureListSize =
|
|
807
|
+
+ (UINT32)(sizeof *RepeatingHeader + CertSize);
|
|
804
808
|
+ RepeatingHeader->SignatureHeaderSize = 0;
|
|
805
809
|
+ RepeatingHeader->SignatureSize =
|
|
806
|
-
+ sizeof RepeatingHeader->SignatureOwner + CertSize
|
|
810
|
+
+ (UINT32)(sizeof RepeatingHeader->SignatureOwner + CertSize);
|
|
807
811
|
+ CopyGuid (&RepeatingHeader->SignatureOwner, OwnerGuid);
|
|
808
812
|
+ Position += sizeof *RepeatingHeader;
|
|
809
813
|
+
|
|
@@ -1076,10 +1080,10 @@ index 0000000..ac919bb
|
|
|
1076
1080
|
+ UefiLib
|
|
1077
1081
|
+ UefiRuntimeServicesTableLib
|
|
1078
1082
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
1079
|
-
index
|
|
1083
|
+
index 8af3267..6fb5c9c 100644
|
|
1080
1084
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
1081
1085
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
1082
|
-
|
|
1086
|
+
|
|
1083
1087
|
|
|
1084
1088
|
!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
1085
1089
|
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
|
@@ -1091,10 +1095,10 @@ index fa9661c..e2e6ba3 100644
|
|
|
1091
1095
|
|
|
1092
1096
|
OvmfPkg/PlatformDxe/Platform.inf
|
|
1093
1097
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
1094
|
-
index
|
|
1098
|
+
index 4bb38d0..e5abaff 100644
|
|
1095
1099
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
1096
1100
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
1097
|
-
|
|
1101
|
+
|
|
1098
1102
|
|
|
1099
1103
|
!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
1100
1104
|
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
|
@@ -1106,10 +1110,10 @@ index 667584a..a0ae1aa 100644
|
|
|
1106
1110
|
|
|
1107
1111
|
OvmfPkg/PlatformDxe/Platform.inf
|
|
1108
1112
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
1109
|
-
index
|
|
1113
|
+
index be3aa1f..4c36a7d 100644
|
|
1110
1114
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
1111
1115
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
1112
|
-
|
|
1116
|
+
|
|
1113
1117
|
|
|
1114
1118
|
!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
1115
1119
|
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
|
@@ -1120,3 +1124,6 @@ index 5ae8469..87cee52 100644
|
|
|
1120
1124
|
!endif
|
|
1121
1125
|
|
|
1122
1126
|
OvmfPkg/PlatformDxe/Platform.inf
|
|
1127
|
+
--
|
|
1128
|
+
1.8.3.1
|
|
1129
|
+
|
edk2.spec
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
Name: edk2
|
|
6
6
|
Version: %{edk2_date}git%{edk2_githash}
|
|
7
|
-
Release:
|
|
7
|
+
Release: 2%{dist}
|
|
8
8
|
Summary: EFI Development Kit II
|
|
9
9
|
|
|
10
10
|
Group: Applications/Emulators
|
|
@@ -305,6 +305,9 @@ cp -a arm %{buildroot}/usr/share/%{name}
|
|
|
305
305
|
|
|
306
306
|
|
|
307
307
|
%changelog
|
|
308
|
+
* Thu Feb 16 2017 Cole Robinson <crobinso@redhat.com> - 20170209git296153c5-2
|
|
309
|
+
- Update EnrollDefaultKeys patch (bz #1398743)
|
|
310
|
+
|
|
308
311
|
* Mon Feb 13 2017 Paolo Bonzini <pbonzini@redhat.com> - 20170209git296153c5-1
|
|
309
312
|
- Rebase to git master
|
|
310
313
|
- New patch 0010 fixes failure to build from source.
|