Skip to content

Commit

Permalink
Rename "previous" revocations to "automatic"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jsetje committed Jan 29, 2024
1 parent 5c50e85 commit 4cad037
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ endef

SBATPATH = $(TOPDIR)/data/sbat.csv
SBATLEVELLATESTPATH = $(TOPDIR)/data/sbat_level_latest.csv
SBATLEVELPREVIOUSPATH = $(TOPDIR)/data/sbat_level_previous.csv
SBATLEVELAUTOMATICPATH = $(TOPDIR)/data/sbat_level_automatic.csv
SSPVLATESTPATH = $(TOPDIR)/data/SkuSiPolicy_Version_latest.bin
SSPSLATESTPATH = $(TOPDIR)/data/SkuSiPolicy_latest.bin
SSPVPREVIOUSPATH = $(TOPDIR)/data/SkuSiPolicy_Version_previous.bin
SSPSPREVIOUSPATH = $(TOPDIR)/data/SkuSiPolicy_previous.bin
SSPVAUTOMATICPATH = $(TOPDIR)/data/SkuSiPolicy_Version_automatic.bin
SSPSAUTOMATICPATH = $(TOPDIR)/data/SkuSiPolicy_automatic.bin
VENDOR_SBATS := $(sort $(foreach x,$(wildcard $(TOPDIR)/data/sbat.*.csv data/sbat.*.csv),$(notdir $(x))))

OBJFLAGS =
Expand Down Expand Up @@ -107,7 +107,7 @@ revocations.so : revocation_data.o revocations.o
revocations.so : SOLIBS=
revocations.so : SOFLAGS=
revocations.efi : OBJFLAGS = --strip-unneeded
revocations.efi : SECTIONS=.text .reloc .sbat .sbatl .sbatp .sspvp .sspsp .sspvl .sspsl
revocations.efi : SECTIONS=.text .reloc .sbat .sbatl .sbata .sspva .sspsa .sspvl .sspsl

revocations.o : certmule.o
cp certmule.o revocations.o
Expand All @@ -130,20 +130,20 @@ revocation_data.o : /dev/null
$(OBJCOPY) --add-section .sbatl=$(SBATLEVELLATESTPATH) \
--set-section-flags .sbatl=contents,alloc,load,readonly,data \
$@
$(OBJCOPY) --add-section .sbatp=$(SBATLEVELPREVIOUSPATH) \
--set-section-flags .sbatp=contents,alloc,load,readonly,data \
$(OBJCOPY) --add-section .sbata=$(SBATLEVELAUTOMATICPATH) \
--set-section-flags .sbata=contents,alloc,load,readonly,data \
$@
$(OBJCOPY) --add-section .sspvl=$(SSPVLATESTPATH) \
--set-section-flags .sspvl=contents,alloc,load,readonly,data \
$@
$(OBJCOPY) --add-section .sspsl=$(SSPSLATESTPATH) \
--set-section-flags .sspsl=contents,alloc,load,readonly,data \
$@
$(OBJCOPY) --add-section .sspvp=$(SSPVPREVIOUSPATH) \
--set-section-flags .sspvp=contents,alloc,load,readonly,data \
$(OBJCOPY) --add-section .sspva=$(SSPVAUTOMATICPATH) \
--set-section-flags .sspva=contents,alloc,load,readonly,data \
$@
$(OBJCOPY) --add-section .sspsp=$(SSPSPREVIOUSPATH) \
--set-section-flags .sspsp=contents,alloc,load,readonly,data \
$(OBJCOPY) --add-section .sspsa=$(SSPSAUTOMATICPATH) \
--set-section-flags .sspsa=contents,alloc,load,readonly,data \
$@
$(foreach vs,$(VENDOR_SBATS),$(call add-vendor-sbat,$(vs),$@))

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 4cad037

Please sign in to comment.