From: Simon Glass <sjg@chromium.org> Move efi_guid_image_security_database to a common file so that it can be used by the app. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/efi.h | 2 ++ include/efi_loader.h | 1 - lib/efi/device_path.c | 3 +++ lib/efi_loader/efi_var_common.c | 3 --- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/efi.h b/include/efi.h index 5e15a87ed3b..3558c03db23 100644 --- a/include/efi.h +++ b/include/efi.h @@ -157,6 +157,8 @@ extern const efi_guid_t efi_guid_fdt; /* GUID of the EFI_DRIVER_BINDING_PROTOCOL */ extern const efi_guid_t efi_guid_driver_binding_protocol; extern const efi_guid_t efi_guid_component_name2; +/* GUIDs for authentication - most of these are still in efi_loader.h */ +extern const efi_guid_t efi_guid_image_security_database; /* Generic EFI table header */ struct efi_table_hdr { diff --git a/include/efi_loader.h b/include/efi_loader.h index a475ebb5413..52314c33533 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -353,7 +353,6 @@ extern const efi_guid_t efi_guid_hii_config_access_protocol; extern const efi_guid_t efi_guid_hii_database_protocol; extern const efi_guid_t efi_guid_hii_string_protocol; /* GUIDs for authentication */ -extern const efi_guid_t efi_guid_image_security_database; extern const efi_guid_t efi_guid_sha256; extern const efi_guid_t efi_guid_cert_x509; extern const efi_guid_t efi_guid_cert_x509_sha256; diff --git a/lib/efi/device_path.c b/lib/efi/device_path.c index 449b9d4239b..1dc28f81146 100644 --- a/lib/efi/device_path.c +++ b/lib/efi/device_path.c @@ -39,6 +39,9 @@ const efi_guid_t efi_guid_driver_binding_protocol = EFI_DRIVER_BINDING_PROTOCOL_GUID; const efi_guid_t efi_guid_component_name2 = EFI_COMPONENT_NAME2_PROTOCOL_GUID; +const efi_guid_t efi_guid_image_security_database = + EFI_IMAGE_SECURITY_DATABASE_GUID; + /* template EFI_DP_END node: */ const struct efi_device_path EFI_DP_END = { .type = DEVICE_PATH_TYPE_END, diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c index 4b34a58b4cf..f2fbf67f5ed 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c @@ -25,9 +25,6 @@ struct efi_auth_var_name_type { const enum efi_auth_var_type type; }; -const efi_guid_t efi_guid_image_security_database = - EFI_IMAGE_SECURITY_DATABASE_GUID; - static const struct efi_auth_var_name_type name_type[] = { {u"PK", &efi_global_variable_guid, EFI_AUTH_VAR_PK}, {u"KEK", &efi_global_variable_guid, EFI_AUTH_VAR_KEK}, -- 2.43.0