diff options
| -rw-r--r-- | include/Http.h | 6 | ||||
| -rw-r--r-- | include/Ip4Config2.h | 6 | ||||
| -rw-r--r-- | include/Ip6Config.h | 6 | ||||
| -rw-r--r-- | include/PasswordCrypt.h | 6 | ||||
| -rw-r--r-- | include/PeImage.h | 6 | ||||
| -rw-r--r-- | include/configtable.h | 4 | ||||
| -rw-r--r-- | include/console.h | 8 | ||||
| -rw-r--r-- | include/crypt_blowfish.h | 7 | ||||
| -rw-r--r-- | include/efiauthenticated.h | 7 | ||||
| -rw-r--r-- | include/errors.h | 4 | ||||
| -rw-r--r-- | include/execute.h | 5 | ||||
| -rw-r--r-- | include/guid.h | 5 | ||||
| -rw-r--r-- | include/hexdump.h | 2 | ||||
| -rw-r--r-- | include/httpboot.h | 6 | ||||
| -rw-r--r-- | include/netboot.h | 7 | ||||
| -rw-r--r-- | include/replacements.h | 2 | ||||
| -rw-r--r-- | include/security_policy.h | 6 | ||||
| -rw-r--r-- | include/shell.h | 5 | ||||
| -rw-r--r-- | include/simple_file.h | 5 | ||||
| -rw-r--r-- | include/tpm.h | 5 | ||||
| -rw-r--r-- | include/variables.h | 6 | ||||
| -rw-r--r-- | include/version.h | 8 | ||||
| -rw-r--r-- | include/wincert.h | 6 |
23 files changed, 80 insertions, 48 deletions
diff --git a/include/Http.h b/include/Http.h index cd77703c..d8c397d7 100644 --- a/include/Http.h +++ b/include/Http.h @@ -19,8 +19,8 @@ **/ -#ifndef __EFI_HTTP_PROTOCOL_H__ -#define __EFI_HTTP_PROTOCOL_H__ +#ifndef SHIM_HTTP_H +#define SHIM_HTTP_H #define EFI_HTTP_SERVICE_BINDING_PROTOCOL_GUID \ { \ @@ -514,4 +514,4 @@ struct _EFI_HTTP_PROTOCOL { EFI_HTTP_POLL Poll; }; -#endif +#endif /* SHIM_HTTP_H */ diff --git a/include/Ip4Config2.h b/include/Ip4Config2.h index b4f1d844..8c0bced8 100644 --- a/include/Ip4Config2.h +++ b/include/Ip4Config2.h @@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This Protocol is introduced in UEFI Specification 2.5 **/ -#ifndef __EFI_IP4CONFIG2_PROTOCOL_H__ -#define __EFI_IP4CONFIG2_PROTOCOL_H__ +#ifndef SHIM_IP4CONFIG2_H +#define SHIM_IP4CONFIG2_H #include <efiip.h> @@ -312,4 +312,4 @@ struct _EFI_IP4_CONFIG2_PROTOCOL { EFI_IP4_CONFIG2_UNREGISTER_NOTIFY UnregisterDataNotify; }; -#endif +#endif /* SHIM_IP4CONFIG2_H */ diff --git a/include/Ip6Config.h b/include/Ip6Config.h index 003e50e3..e9d3deff 100644 --- a/include/Ip6Config.h +++ b/include/Ip6Config.h @@ -12,8 +12,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef __EFI_IP6CONFIG_PROTOCOL_H__ -#define __EFI_IP6CONFIG_PROTOCOL_H__ +#ifndef SHIM_IP6CONFIG_H +#define SHIM_IP6CONFIG_H #include <efiip.h> @@ -363,4 +363,4 @@ struct _EFI_IP6_CONFIG_PROTOCOL { EFI_IP6_CONFIG_UNREGISTER_NOTIFY UnregisterDataNotify; }; -#endif +#endif /* SHIM_IP6CONFIG_H */ diff --git a/include/PasswordCrypt.h b/include/PasswordCrypt.h index b726f320..cadad727 100644 --- a/include/PasswordCrypt.h +++ b/include/PasswordCrypt.h @@ -1,5 +1,5 @@ -#ifndef __PASSWORD_CRYPT_H__ -#define __PASSWORD_CRYPT_H__ +#ifndef SHIM_PASSWORDCRYPT_H +#define SHIM_PASSWORDCRYPT_H enum HashMethod { TRADITIONAL_DES = 0, @@ -24,4 +24,4 @@ EFI_STATUS password_crypt (const char *password, UINT32 pw_length, const PASSWORD_CRYPT *pw_hash, UINT8 *hash); UINT16 get_hash_size (const UINT16 method); -#endif /* __PASSWORD_CRYPT_H__ */ +#endif /* SHIM_PASSWORDCRYPT_H */ diff --git a/include/PeImage.h b/include/PeImage.h index 17f186c7..a606e8b2 100644 --- a/include/PeImage.h +++ b/include/PeImage.h @@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#ifndef __PE_IMAGE_H__
-#define __PE_IMAGE_H__
+#ifndef SHIM_PEIMAGE_H
+#define SHIM_PEIMAGE_H
#include <wincert.h>
@@ -786,4 +786,4 @@ typedef struct { EFI_IMAGE_OPTIONAL_HEADER_UNION *PEHdr;
} PE_COFF_LOADER_IMAGE_CONTEXT;
-#endif
+#endif /* SHIM_PEIMAGE_H */
diff --git a/include/configtable.h b/include/configtable.h index fa2b5058..0c9dfdca 100644 --- a/include/configtable.h +++ b/include/configtable.h @@ -1,3 +1,6 @@ +#ifndef SHIM_CONFIGTABLE_H +#define SHIM_CONFIGTABLE_H + /* definitions straight from TianoCore */ typedef UINT32 EFI_IMAGE_EXECUTION_ACTION; @@ -66,3 +69,4 @@ configtable_find_image(const EFI_DEVICE_PATH *DevicePath); int configtable_image_is_forbidden(const EFI_DEVICE_PATH *DevicePath); +#endif /* SHIM_CONFIGTABLE_H */ diff --git a/include/console.h b/include/console.h index 6481a3d3..c11d9bc8 100644 --- a/include/console.h +++ b/include/console.h @@ -1,5 +1,5 @@ -#ifndef _SHIM_LIB_CONSOLE_H -#define _SHIM_LIB_CONSOLE_H 1 +#ifndef SHIM_CONSOLE_H +#define SHIM_CONSOLE_H EFI_STATUS console_get_keystroke(EFI_INPUT_KEY *key); @@ -42,7 +42,7 @@ EFI_STATUS (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) ( IN EFI_CONSOLE_CONTROL_PROTOCOL *This, OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode, - OUT BOOLEAN *GopUgaExists, OPTIONAL + OUT BOOLEAN *GopUgaExists, OPTIONAL OUT BOOLEAN *StdInLocked OPTIONAL ); @@ -97,4 +97,4 @@ extern VOID msleep(unsigned long msecs); * console */ extern UINT8 in_protocol; -#endif /* _SHIM_LIB_CONSOLE_H */ +#endif /* SHIM_CONSOLE_H */ diff --git a/include/crypt_blowfish.h b/include/crypt_blowfish.h index dc3bd567..8d4dd4da 100644 --- a/include/crypt_blowfish.h +++ b/include/crypt_blowfish.h @@ -14,9 +14,10 @@ * See crypt_blowfish.c for more information. */ -#ifndef _CRYPT_BLOWFISH_H -#define _CRYPT_BLOWFISH_H +#ifndef SHIM_CRYPT_BLOWFISH_H +#define SHIM_CRYPT_BLOWFISH_H char *crypt_blowfish_rn(const char *key, const char *setting, char *output, int size); -#endif + +#endif /* SHIM_CRYPT_BLOWFISH_H */ diff --git a/include/efiauthenticated.h b/include/efiauthenticated.h index f7d6bcb1..e2bd4822 100644 --- a/include/efiauthenticated.h +++ b/include/efiauthenticated.h @@ -1,5 +1,6 @@ -#ifndef _INC_EFIAUTHENTICATED_H -#define _INC_EFIAUTHENTICATED_H +#ifndef SHIM_EFIAUTHENTICATED_H +#define SHIM_EFIAUTHENTICATED_H + #include <wincert.h> //*********************************************************************** // Signature Database @@ -219,4 +220,4 @@ typedef struct { #define OFFSET_OF_AUTHINFO2_CERT_DATA ((OFFSET_OF (EFI_VARIABLE_AUTHENTICATION_2, AuthInfo)) + \ (OFFSET_OF (WIN_CERTIFICATE_UEFI_GUID, CertData))) -#endif +#endif /* SHIM_EFIAUTHENTICATED_H */ diff --git a/include/errors.h b/include/errors.h index 0da4bb59..21978bd8 100644 --- a/include/errors.h +++ b/include/errors.h @@ -1,3 +1,6 @@ +#ifndef SHIM_ERRORS_H +#define SHIM_ERRORS_H + #include <efierr.h> #ifndef EFI_INCOMPATIBLE_VERSION @@ -7,3 +10,4 @@ #define EFI_SECURITY_VIOLATION EFIERR(26) #endif +#endif /* SHIM_ERRORS_H */ diff --git a/include/execute.h b/include/execute.h index 9aecbff8..18d2fa29 100644 --- a/include/execute.h +++ b/include/execute.h @@ -1,5 +1,10 @@ +#ifndef SHIM_LIB_EXECUTE_H +#define SHIM_LIB_EXECUTE_H + EFI_STATUS generate_path(CHAR16* name, EFI_LOADED_IMAGE *li, EFI_DEVICE_PATH **path, CHAR16 **PathName); EFI_STATUS execute(EFI_HANDLE image, CHAR16 *name); + +#endif /* SHIM_LIB_EXECUTE_H */ diff --git a/include/guid.h b/include/guid.h index 86b709b8..b2c1f8ff 100644 --- a/include/guid.h +++ b/include/guid.h @@ -1,3 +1,6 @@ +#ifndef SHIM_GUID_H +#define SHIM_GUID_H + #include <efi.h> extern EFI_GUID GV_GUID; @@ -12,3 +15,5 @@ extern EFI_GUID EFI_CERT_SHA256_GUID; extern EFI_GUID MOK_OWNER; extern EFI_GUID SECURITY_PROTOCOL_GUID; extern EFI_GUID SECURITY2_PROTOCOL_GUID; + +#endif /* SHIM_GUID_H */ diff --git a/include/hexdump.h b/include/hexdump.h index d5ece4dd..c4ffcaec 100644 --- a/include/hexdump.h +++ b/include/hexdump.h @@ -101,4 +101,4 @@ hexdump(UINT8 *data, UINTN size) } } -#endif +#endif /* STATIC_HEXDUMP_H */ diff --git a/include/httpboot.h b/include/httpboot.h index 2d8d1a1f..b47f6a9d 100644 --- a/include/httpboot.h +++ b/include/httpboot.h @@ -31,11 +31,11 @@ * Corporation. */ -#ifndef _HTTPBOOT_H_ -#define _HTTPBOOT_H_ +#ifndef SHIM_HTTPBOOT_H +#define SHIM_HTTPBOOT_H extern BOOLEAN find_httpboot(EFI_HANDLE device); extern EFI_STATUS httpboot_fetch_buffer(EFI_HANDLE image, VOID **buffer, UINT64 *buf_size); -#endif +#endif /* SHIM_HTTPBOOT_H */ diff --git a/include/netboot.h b/include/netboot.h index 6417373b..d1ad1257 100644 --- a/include/netboot.h +++ b/include/netboot.h @@ -1,9 +1,10 @@ -#ifndef _NETBOOT_H_ -#define _NETBOOT_H_ +#ifndef SHIM_NETBOOT_H +#define SHIM_NETBOOT_H extern BOOLEAN findNetboot(EFI_HANDLE image_handle); extern EFI_STATUS parseNetbootinfo(EFI_HANDLE image_handle); extern EFI_STATUS FetchNetbootimage(EFI_HANDLE image_handle, VOID **buffer, UINT64 *bufsiz); -#endif + +#endif /* SHIM_NETBOOT_H */ diff --git a/include/replacements.h b/include/replacements.h index e38cded1..5873a720 100644 --- a/include/replacements.h +++ b/include/replacements.h @@ -27,7 +27,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef SHIM_REPLACEMENTS_H -#define SHIM_REPLACEMENTS_H 1 +#define SHIM_REPLACEMENTS_H typedef enum { VERIFIED_BY_NOTHING, diff --git a/include/security_policy.h b/include/security_policy.h index 7854db11..7cfbfd03 100644 --- a/include/security_policy.h +++ b/include/security_policy.h @@ -1,5 +1,5 @@ -#ifndef _SHIM_LIB_SECURITY_POLICY_H -#define _SHIM_LIB_SECURITY_POLICY_H 1 +#ifndef SHIM_SECURITY_POLICY_H +#define SHIM_SECURITY_POLICY_H #if defined(OVERRIDE_SECURITY_POLICY) typedef EFI_STATUS (*SecurityHook) (void *data, UINT32 len); @@ -12,4 +12,4 @@ void security_protocol_set_hashes(unsigned char *esl, int len); #endif /* OVERRIDE_SECURITY_POLICY */ -#endif /* SHIM_LIB_SECURITY_POLICY_H */ +#endif /* SHIM_SECURITY_POLICY_H */ diff --git a/include/shell.h b/include/shell.h index 9cb5d479..fec50137 100644 --- a/include/shell.h +++ b/include/shell.h @@ -1,2 +1,7 @@ +#ifndef SHIM_SHELL_H +#define SHIM_SHELL_H + EFI_STATUS argsplit(EFI_HANDLE image, int *argc, CHAR16*** ARGV); + +#endif /* SHIM_SHELL_H */ diff --git a/include/simple_file.h b/include/simple_file.h index fe4fd97d..8d25a761 100644 --- a/include/simple_file.h +++ b/include/simple_file.h @@ -1,3 +1,6 @@ +#ifndef SHIM_SIMPLE_FILE_H +#define SHIM_SIMPLE_FILE_H + EFI_STATUS simple_file_open (EFI_HANDLE image, CHAR16 *name, EFI_FILE **file, UINT64 mode); EFI_STATUS @@ -19,3 +22,5 @@ simple_file_selector(EFI_HANDLE *im, CHAR16 **title, CHAR16 *name, CHAR16 *filter, CHAR16 **result); EFI_STATUS simple_volume_selector(CHAR16 **title, CHAR16 **selected, EFI_HANDLE *h); + +#endif /* SHIM_SIMPLE_FILE_H */ diff --git a/include/tpm.h b/include/tpm.h index d11b545b..0b0cd66d 100644 --- a/include/tpm.h +++ b/include/tpm.h @@ -1,3 +1,6 @@ +#ifndef SHIM_TPM_H +#define SHIM_TPM_H + #include <efilib.h> #define EFI_TPM_GUID {0xf541796d, 0xa62e, 0x4954, {0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd }}; @@ -186,3 +189,5 @@ typedef UINT32 TCG_EVENTTYPE; #define EV_EFI_VARIABLE_AUTHORITY (EV_EFI_EVENT_BASE + 0xE0) #define PE_COFF_IMAGE 0x0000000000000010 + +#endif /* SHIM_TPM_H */ diff --git a/include/variables.h b/include/variables.h index deed269c..8566a1a4 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,5 +1,7 @@ -#include <efiauthenticated.h> +#ifndef SHIM_VARIABLES_H +#define SHIM_VARIABLES_H +#include <efiauthenticated.h> #include <PeImage.h> /* for SHA256_DIGEST_SIZE */ #define certlist_for_each_certentry(cl, cl_init, s, s_init) \ @@ -57,3 +59,5 @@ variable_enroll_hash(CHAR16 *var, EFI_GUID owner, EFI_STATUS variable_create_esl(void *cert, int cert_len, EFI_GUID *type, EFI_GUID *owner, void **out, int *outlen); + +#endif /* SHIM_VARIABLES_H */ diff --git a/include/version.h b/include/version.h deleted file mode 100644 index 09fd44ae..00000000 --- a/include/version.h +++ /dev/null @@ -1,8 +0,0 @@ -#define VERSION "1.3.4" - -static void -version(const char *progname) -{ - printf("%s " VERSION "\n", progname); -} - diff --git a/include/wincert.h b/include/wincert.h index 68d1974a..a3ce12a2 100644 --- a/include/wincert.h +++ b/include/wincert.h @@ -1,5 +1,5 @@ -#ifndef _INC_WINCERT_H -#define _INC_WINCERT_H +#ifndef SHIM_WINCERT_H +#define SHIM_WINCERT_H /// /// The WIN_CERTIFICATE structure is part of the PE/COFF specification. @@ -30,4 +30,4 @@ typedef struct { } WIN_CERTIFICATE; -#endif +#endif /* SHIM_WINCERT_H */ |