summaryrefslogtreecommitdiff
path: root/shim.h
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2020-07-23 00:08:30 -0400
committerPeter Jones <pjones@redhat.com>2020-07-23 20:53:24 -0400
commit7d542805ba5c48185128a2351bb315a5648fe3d7 (patch)
treeec73eee2eb8e1be80bf6b5c68d4222529a316853 /shim.h
parenta7f9911b776f3cdc12e42bf5990ddef0b08d3701 (diff)
downloadefi-boot-shim-7d542805ba5c48185128a2351bb315a5648fe3d7.tar.gz
efi-boot-shim-7d542805ba5c48185128a2351bb315a5648fe3d7.zip
Make cert.S not impossible to read.
Signed-off-by: Peter Jones <pjones@redhat.com> Upstream: pr#206
Diffstat (limited to 'shim.h')
-rw-r--r--shim.h28
1 files changed, 24 insertions, 4 deletions
diff --git a/shim.h b/shim.h
index a0fa5a75..555498c6 100644
--- a/shim.h
+++ b/shim.h
@@ -97,6 +97,24 @@
#define FALLBACK L"\\fb" EFI_ARCH L".efi"
#define MOK_MANAGER L"\\mm" EFI_ARCH L".efi"
+#if defined(VENDOR_CERT_FILE)
+# define vendor_authorized vendor_cert
+# define vendor_authorized_size vendor_cert_size
+# define vendor_authorized_category VENDOR_ADDEND_X509
+#else
+# define vendor_authorized vendor_null
+# define vendor_authorized_size vendor_null_size
+# define vendor_authorized_category VENDOR_ADDEND_NONE
+#endif
+
+#if defined(VENDOR_DBX_FILE)
+# define vendor_deauthorized vendor_dbx
+# define vendor_deauthorized_size vendor_dbx_size
+#else
+# define vendor_deauthorized vendor_deauthorized_null
+# define vendor_deauthorized_size vendor_deauthorized_null_size
+#endif
+
#include "include/asm.h"
#include "include/configtable.h"
#include "include/console.h"
@@ -166,10 +184,12 @@ extern VOID ClearErrors(VOID);
extern EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath);
extern EFI_STATUS import_mok_state(EFI_HANDLE image_handle);
-extern UINT32 vendor_cert_size;
-extern UINT32 vendor_dbx_size;
-extern UINT8 *vendor_cert;
-extern UINT8 *vendor_dbx;
+extern UINT32 vendor_authorized_size;
+extern UINT8 *vendor_authorized;
+
+extern UINT32 vendor_deauthorized_size;
+extern UINT8 *vendor_deauthorized;
+
#if defined(ENABLE_SHIM_CERT)
extern UINT32 build_cert_size;
extern UINT8 *build_cert;