diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Http.h | 10 | ||||
| -rw-r--r-- | include/Ip4Config2.h | 5 | ||||
| -rw-r--r-- | include/Ip6Config.h | 5 | ||||
| -rw-r--r-- | include/console.h | 3 | ||||
| -rw-r--r-- | include/efiauthenticated.h | 22 | ||||
| -rw-r--r-- | include/guid.h | 23 | ||||
| -rw-r--r-- | include/tpm.h | 3 |
7 files changed, 21 insertions, 50 deletions
diff --git a/include/Http.h b/include/Http.h index d8c397d7..4b3746a7 100644 --- a/include/Http.h +++ b/include/Http.h @@ -22,16 +22,6 @@ #ifndef SHIM_HTTP_H #define SHIM_HTTP_H -#define EFI_HTTP_SERVICE_BINDING_PROTOCOL_GUID \ - { \ - 0xbdc8e6af, 0xd9bc, 0x4379, {0xa7, 0x2a, 0xe0, 0xc4, 0xe7, 0x5d, 0xae, 0x1c } \ - } - -#define EFI_HTTP_PROTOCOL_GUID \ - { \ - 0x7a59b29b, 0x910b, 0x4171, {0x82, 0x42, 0xa8, 0x5a, 0x0d, 0xf2, 0x5b, 0x5b } \ - } - typedef struct _EFI_HTTP_PROTOCOL EFI_HTTP_PROTOCOL; /// diff --git a/include/Ip4Config2.h b/include/Ip4Config2.h index 8c0bced8..efacaf83 100644 --- a/include/Ip4Config2.h +++ b/include/Ip4Config2.h @@ -20,11 +20,6 @@ This Protocol is introduced in UEFI Specification 2.5 #include <efiip.h> -#define EFI_IP4_CONFIG2_PROTOCOL_GUID \ - { \ - 0x5b446ed1, 0xe30b, 0x4faa, {0x87, 0x1a, 0x36, 0x54, 0xec, 0xa3, 0x60, 0x80 } \ - } - typedef struct _EFI_IP4_CONFIG2_PROTOCOL EFI_IP4_CONFIG2_PROTOCOL; diff --git a/include/Ip6Config.h b/include/Ip6Config.h index e9d3deff..f99ce013 100644 --- a/include/Ip6Config.h +++ b/include/Ip6Config.h @@ -17,11 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <efiip.h> -#define EFI_IP6_CONFIG_PROTOCOL_GUID \ - { \ - 0x937fe521, 0x95ae, 0x4d1a, {0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } \ - } - typedef struct _EFI_IP6_CONFIG_PROTOCOL EFI_IP6_CONFIG_PROTOCOL; /// diff --git a/include/console.h b/include/console.h index c11d9bc8..5d9cd64d 100644 --- a/include/console.h +++ b/include/console.h @@ -26,9 +26,6 @@ void console_reset(void); #define NOSEL 0x7fffffff -#define EFI_CONSOLE_CONTROL_PROTOCOL_GUID \ - { 0xf42f7782, 0x12e, 0x4c12, {0x99, 0x56, 0x49, 0xf9, 0x43, 0x4, 0xf7, 0x21} } - typedef struct _EFI_CONSOLE_CONTROL_PROTOCOL EFI_CONSOLE_CONTROL_PROTOCOL; typedef enum { diff --git a/include/efiauthenticated.h b/include/efiauthenticated.h index 671966e1..a9c395f6 100644 --- a/include/efiauthenticated.h +++ b/include/efiauthenticated.h @@ -60,28 +60,6 @@ typedef struct { #define WIN_CERT_TYPE_EFI_PKCS115 0x0EF0 #define WIN_CERT_TYPE_EFI_GUID 0x0EF1 -#define EFI_CERT_X509_GUID \ - (EFI_GUID) { \ - 0xa5c059a1, 0x94e4, 0x4aa7, {0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72} \ - } - -#define EFI_CERT_RSA2048_GUID \ - (EFI_GUID) { \ - 0x3c5766e8, 0x269c, 0x4e34, {0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6} \ - } - - -#define EFI_CERT_TYPE_PKCS7_GUID \ - (EFI_GUID) { \ - 0x4aafd29d, 0x68df, 0x49ee, {0x8a, 0xa9, 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7} \ - } - -/* - * WIN_CERTIFICATE_UEFI_GUID.CertType - */ -#define EFI_CERT_TYPE_RSA2048_SHA256_GUID \ - {0xa7717414, 0xc616, 0x4977, {0x94, 0x20, 0x84, 0x47, 0x12, 0xa7, 0x35, 0xbf } } - /* * WIN_CERTIFICATE_UEFI_GUID.CertData */ diff --git a/include/guid.h b/include/guid.h index b2c1f8ff..81689d6c 100644 --- a/include/guid.h +++ b/include/guid.h @@ -3,17 +3,36 @@ #include <efi.h> +extern EFI_GUID BDS_GUID; extern EFI_GUID GV_GUID; extern EFI_GUID SIG_DB; extern EFI_GUID X509_GUID; extern EFI_GUID RSA2048_GUID; extern EFI_GUID PKCS7_GUID; extern EFI_GUID IMAGE_PROTOCOL; -extern EFI_GUID SIMPLE_FS_PROTOCOL; +extern EFI_GUID EFI_FILE_INFO_GUID; +extern EFI_GUID EFI_FILE_SYSTEM_INFO_GUID; +extern EFI_GUID EFI_CERT_RSA2048_GUID; extern EFI_GUID EFI_CERT_SHA1_GUID; extern EFI_GUID EFI_CERT_SHA256_GUID; -extern EFI_GUID MOK_OWNER; +extern EFI_GUID EFI_CERT_SHA224_GUID; +extern EFI_GUID EFI_CERT_SHA384_GUID; +extern EFI_GUID EFI_CERT_SHA512_GUID; +extern EFI_GUID EFI_CERT_TYPE_PKCS7_GUID; +extern EFI_GUID EFI_CERT_TYPE_RSA2048_SHA256_GUID; +extern EFI_GUID EFI_CERT_TYPE_X509_GUID; +extern EFI_GUID EFI_CONSOLE_CONTROL_GUID; +extern EFI_GUID EFI_HTTP_BINDING_GUID; +extern EFI_GUID EFI_HTTP_PROTOCOL_GUID; +extern EFI_GUID EFI_IP4_CONFIG2_GUID; +extern EFI_GUID EFI_IP6_CONFIG_GUID; +extern EFI_GUID EFI_LOADED_IMAGE_GUID; +extern EFI_GUID EFI_TPM_GUID; +extern EFI_GUID EFI_TPM2_GUID; +extern EFI_GUID EFI_SECURE_BOOT_DB_GUID; +extern EFI_GUID EFI_SIMPLE_FILE_SYSTEM_GUID; extern EFI_GUID SECURITY_PROTOCOL_GUID; extern EFI_GUID SECURITY2_PROTOCOL_GUID; +extern EFI_GUID SHIM_LOCK_GUID; #endif /* SHIM_GUID_H */ diff --git a/include/tpm.h b/include/tpm.h index 0b0cd66d..38642390 100644 --- a/include/tpm.h +++ b/include/tpm.h @@ -3,9 +3,6 @@ #include <efilib.h> -#define EFI_TPM_GUID {0xf541796d, 0xa62e, 0x4954, {0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd }}; -#define EFI_TPM2_GUID {0x607f766c, 0x7455, 0x42be, {0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f }}; - #define TPM_ALG_SHA 0x00000004 #define EV_IPL 0x0000000d |