Skip to content

Commit 4cad037

Browse files
committed
Rename "previous" revocations to "automatic"
When the term previous was introduced for revocations to be automatically applied there was a hope that everytime a new revocation was built into shim, the previous revocation could be applied automatically. Further experience has shown the real world to be more complex than that. The automatic payload will realistically contain a set of revocations governed by both the cadence at which a distro's customer base updates as well as the severity of the issue being revoked. This is not a functional change. Signed-off-by: Jan Setje-Eilers <Jan.SetjeEilers@oracle.com>
1 parent 5c50e85 commit 4cad037

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ endef
5959

6060
SBATPATH = $(TOPDIR)/data/sbat.csv
6161
SBATLEVELLATESTPATH = $(TOPDIR)/data/sbat_level_latest.csv
62-
SBATLEVELPREVIOUSPATH = $(TOPDIR)/data/sbat_level_previous.csv
62+
SBATLEVELAUTOMATICPATH = $(TOPDIR)/data/sbat_level_automatic.csv
6363
SSPVLATESTPATH = $(TOPDIR)/data/SkuSiPolicy_Version_latest.bin
6464
SSPSLATESTPATH = $(TOPDIR)/data/SkuSiPolicy_latest.bin
65-
SSPVPREVIOUSPATH = $(TOPDIR)/data/SkuSiPolicy_Version_previous.bin
66-
SSPSPREVIOUSPATH = $(TOPDIR)/data/SkuSiPolicy_previous.bin
65+
SSPVAUTOMATICPATH = $(TOPDIR)/data/SkuSiPolicy_Version_automatic.bin
66+
SSPSAUTOMATICPATH = $(TOPDIR)/data/SkuSiPolicy_automatic.bin
6767
VENDOR_SBATS := $(sort $(foreach x,$(wildcard $(TOPDIR)/data/sbat.*.csv data/sbat.*.csv),$(notdir $(x))))
6868

6969
OBJFLAGS =
@@ -107,7 +107,7 @@ revocations.so : revocation_data.o revocations.o
107107
revocations.so : SOLIBS=
108108
revocations.so : SOFLAGS=
109109
revocations.efi : OBJFLAGS = --strip-unneeded
110-
revocations.efi : SECTIONS=.text .reloc .sbat .sbatl .sbatp .sspvp .sspsp .sspvl .sspsl
110+
revocations.efi : SECTIONS=.text .reloc .sbat .sbatl .sbata .sspva .sspsa .sspvl .sspsl
111111

112112
revocations.o : certmule.o
113113
cp certmule.o revocations.o
@@ -130,20 +130,20 @@ revocation_data.o : /dev/null
130130
$(OBJCOPY) --add-section .sbatl=$(SBATLEVELLATESTPATH) \
131131
--set-section-flags .sbatl=contents,alloc,load,readonly,data \
132132
$@
133-
$(OBJCOPY) --add-section .sbatp=$(SBATLEVELPREVIOUSPATH) \
134-
--set-section-flags .sbatp=contents,alloc,load,readonly,data \
133+
$(OBJCOPY) --add-section .sbata=$(SBATLEVELAUTOMATICPATH) \
134+
--set-section-flags .sbata=contents,alloc,load,readonly,data \
135135
$@
136136
$(OBJCOPY) --add-section .sspvl=$(SSPVLATESTPATH) \
137137
--set-section-flags .sspvl=contents,alloc,load,readonly,data \
138138
$@
139139
$(OBJCOPY) --add-section .sspsl=$(SSPSLATESTPATH) \
140140
--set-section-flags .sspsl=contents,alloc,load,readonly,data \
141141
$@
142-
$(OBJCOPY) --add-section .sspvp=$(SSPVPREVIOUSPATH) \
143-
--set-section-flags .sspvp=contents,alloc,load,readonly,data \
142+
$(OBJCOPY) --add-section .sspva=$(SSPVAUTOMATICPATH) \
143+
--set-section-flags .sspva=contents,alloc,load,readonly,data \
144144
$@
145-
$(OBJCOPY) --add-section .sspsp=$(SSPSPREVIOUSPATH) \
146-
--set-section-flags .sspsp=contents,alloc,load,readonly,data \
145+
$(OBJCOPY) --add-section .sspsa=$(SSPSAUTOMATICPATH) \
146+
--set-section-flags .sspsa=contents,alloc,load,readonly,data \
147147
$@
148148
$(foreach vs,$(VENDOR_SBATS),$(call add-vendor-sbat,$(vs),$@))
149149

0 commit comments

Comments
 (0)