UBUNTU: SAUCE: UEFI: Add EFI signature data types

Add the data types that are used for containing hashes, keys and certificates
for cryptographic verification.

Bugzilla: N/A
Upstream-status: Fedora mustard for now

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 1b12c29fdb55e0815725d489b6e32b0673bf83f9..e5fdf0fcaf5491bec1d6999e035aa56913125691 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -620,6 +620,12 @@ void efi_native_runtime_setup(void);
 #define LINUX_EFI_LOADER_ENTRY_GUID            EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf,  0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)
 #define LINUX_EFI_RANDOM_SEED_TABLE_GUID       EFI_GUID(0x1ce1e5bc, 0x7ceb, 0x42f2,  0x81, 0xe5, 0x8a, 0xad, 0xf1, 0x80, 0xf5, 0x7b)
 
+#define EFI_CERT_SHA256_GUID \
+    EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
+
+#define EFI_CERT_X509_GUID \
+    EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
+
 typedef struct {
        efi_guid_t guid;
        u64 table;
@@ -870,6 +876,20 @@ typedef struct {
        efi_memory_desc_t entry[0];
 } efi_memory_attributes_table_t;
 
+typedef struct  {
+       efi_guid_t signature_owner;
+       u8 signature_data[];
+} efi_signature_data_t;
+
+typedef struct {
+       efi_guid_t signature_type;
+       u32 signature_list_size;
+       u32 signature_header_size;
+       u32 signature_size;
+       u8 signature_header[];
+       /* efi_signature_data_t signatures[][] */
+} efi_signature_list_t;
+
 /*
  * All runtime access to EFI goes through this structure:
  */