efi-boot-shim.git, branch 15.1

Fix build error in mok.c

2020-09-09T20:08:58+00:00

Make vendor_dbx correctly propagate as well.

2020-08-04T19:44:01+00:00

Signed-off-by: Peter Jones This is a modified upstream patch, so it applies fine to shim-15 Signed-off-by: Alex Burmashev

Make building without VENDOR_DB_FILE or VENDOR_CERT_FILE work

2020-08-04T19:44:00+00:00

When bd89dabf5fc767e3824 added the capability to use an EFI_SECURITY_LIST as VENDOR_DB_FILE instead of VENDOR_CERT_FILE, and then when I subsequently did the cleanup in 2ab1322fae6f3d3bcfbf, we accidentally broke building with both of those disabled, due to the lack of a definition of vendor_authorized when propagating MokDb forward. This patch adds a default definition of vendor_authorized and vendor_authorized_size, which point at 0 values, for building in the case where neither option is in use. Signed-off-by: Peter Jones This is a modified upstream patch, so it applies fine to shim-15 Signed-off-by: Alex Burmashev

1016-Simplify-cert.S-to-make-it-more-readable.patch

2020-08-04T19:43:58+00:00

This is a modified upstream patch, so it applies fine to shim-15 Signed-off-by: Alex Burmashev

Mok: make sure vendor_cert and vendor_db both get propageted forward

2020-08-04T19:43:57+00:00

Signed-off-by: Peter Jones This is a modified upstream patch, so it applies fine to shim-15 Signed-off-by: Alex Burmashev

Make VENDOR_DB_FILE and VENDOR_CERT_FILE mutually exclusive

2020-08-04T19:43:55+00:00

Signed-off-by: Peter Jones This is a modified upstream patch, so it applies fine to shim-15 Signed-off-by: Alex Burmashev

Add support for vendor_db built-in shim whitelist

2020-08-04T19:43:49+00:00

Potential new signing strategies ( for example signing grub, fwupdate and vmlinuz with separate certificates ) require shim to support a vendor provided bundle of trusted certificates and hashes, which allows shim to "whitelist" EFI binaries matching either certificate by signature, or hash in the vendor_db.. Functionality is similar to vendor_dbx ( vendor blacklist ). Patch is a polished version of code, authored by P. Jones. Signed-off-by: Alex Burmashev

shim: only include shim_cert.h in shim.c

2020-08-04T19:43:08+00:00

The shim_cert array was declared as a static array, and every user of shim_cert.h would create a shim_cert array for its own and grow the file size. To remove the unnecessary duplicate shim_cert arrays, this commit declares shim_cert in shim.c while other users still can access the array through the external variables: build_cert and build_cert_size. Signed-off-by: Gary Lin Upstream-commit-id: 4e2d62f0f4e

mok: also mirror the build cert to MokListRT

2020-08-04T19:42:51+00:00

If the build cert is enabled, we should also mirror it to MokListRT. Signed-off-by: Gary Lin Upstream-commit-id: aecbe1f99b6

Fix for "Section 0 has negative size" error when loading fbaa64.efi

2020-08-04T19:42:35+00:00

The current code is incorrectly failing to load the fbaa64.efi image found in Arm servers even though the UEFI shell code is able to properly load and execute the same image. The problem is due to the presence of a section header that has zero size and address and marked "discardable" in the fbaa64.efi image. Although there is already a check further down in the code to look for the discardable bit and skip further verification checks if set, we never get to that point due to the "end < base" check at the start of the loop. Here is a dump of the fbaa64.efi image as compiled on an Arm machine from the latest code in this repo: % # First I used hexedit to change header byte from 'AA' to '86' % # so that objdump was able to correctly parse the file: % objdump -x -m aarch64 fbaa64.efi fbaa64.efi: file format pei-x86-64 fbaa64.efi architecture: i386:x86-64, flags 0x00000103: HAS_RELOC, EXEC_P, D_PAGED start address 0x0000000000000148 Characteristics 0x20e executable line numbers stripped symbols stripped debugging information removed Time/Date Wed Dec 31 16:00:00 1969 Magic 020b (PE32+) MajorLinkerVersion 2 MinorLinkerVersion 20 SizeOfCode 000b15d0 SizeOfInitializedData 00000000 SizeOfUninitializedData 00000000 AddressOfEntryPoint 0000000000000148 BaseOfCode 0000000000000148 ImageBase 0000000000000000 SectionAlignment 0000000000000020 FileAlignment 0000000000000008 MajorOSystemVersion 0 MinorOSystemVersion 0 MajorImageVersion 0 MinorImageVersion 0 MajorSubsystemVersion 0 MinorSubsystemVersion 0 Win32Version 00000000 SizeOfImage 000b1718 SizeOfHeaders 00000148 CheckSum 00000000 Subsystem 0000000a (EFI application) DllCharacteristics 00000000 SizeOfStackReserve 0000000000000000 SizeOfStackCommit 0000000000000000 SizeOfHeapReserve 0000000000000000 SizeOfHeapCommit 0000000000000000 LoaderFlags 00000000 NumberOfRvaAndSizes 00000006 The Data Directory Entry 0 0000000000000000 00000000 Export Directory [.edata (or where ever we found it)] Entry 1 0000000000000000 00000000 Import Directory [parts of .idata] Entry 2 0000000000000000 00000000 Resource Directory [.rsrc] Entry 3 0000000000000000 00000000 Exception Directory [.pdata] Entry 4 0000000000000000 00000000 Security Directory Entry 5 0000000000000000 00000000 Base Relocation Directory [.reloc] Entry 6 0000000000000000 00000000 Debug Directory Entry 7 0000000000000000 00000000 Description Directory Entry 8 0000000000000000 00000000 Special Directory Entry 9 0000000000000000 00000000 Thread Storage Directory [.tls] Entry a 0000000000000000 00000000 Load Configuration Directory Entry b 0000000000000000 00000000 Bound Import Directory Entry c 0000000000000000 00000000 Import Address Table Directory Entry d 0000000000000000 00000000 Delay Import Directory Entry e 0000000000000000 00000000 CLR Runtime Header Entry f 0000000000000000 00000000 Reserved Sections: Idx Name Size VMA LMA File off Algn 0 .reloc 00000000 0000000000000000 0000000000000000 00000000 2**0 ALLOC, LOAD, READONLY, DATA 1 .text 000b15d0 0000000000000148 0000000000000148 00000148 2**4 CONTENTS, ALLOC, LOAD, CODE SYMBOL TABLE: no symbols Signed-off-by: Maran Wilson Reviewed-by: Aaron Young Reviewed-by: Jack Schwartz Upstream-commit-id: 6df7a8f5609