From d359712e1b1b0ed7ca611dfd11d9f78754a7a013 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 19 May 2013 18:13:01 +0100 Subject: Port MokManager to Linux Foundation loader UI code This is the first stage of porting the MokManager UI to the UI code used by the Linux Foundation UEFI loader. --- include/errors.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/errors.h (limited to 'include/errors.h') diff --git a/include/errors.h b/include/errors.h new file mode 100644 index 00000000..0da4bb59 --- /dev/null +++ b/include/errors.h @@ -0,0 +1,9 @@ +#include + +#ifndef EFI_INCOMPATIBLE_VERSION +#define EFI_INCOMPATIBLE_VERSION EFIERR(25) +#endif +#ifndef EFI_SECURITY_VIOLATION +#define EFI_SECURITY_VIOLATION EFIERR(26) +#endif + -- cgit v1.2.3 From 1f1ec4cea8561d72734a56a76dc63a5c879bc994 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 23 Oct 2017 14:26:28 -0400 Subject: Make sure all of our include files have proper guards. ... and make them all the same formatting too. Signed-off-by: Peter Jones --- include/Http.h | 6 +++--- include/Ip4Config2.h | 6 +++--- include/Ip6Config.h | 6 +++--- include/PasswordCrypt.h | 6 +++--- include/PeImage.h | 6 +++--- include/configtable.h | 4 ++++ include/console.h | 8 ++++---- include/crypt_blowfish.h | 7 ++++--- include/efiauthenticated.h | 7 ++++--- include/errors.h | 4 ++++ include/execute.h | 5 +++++ include/guid.h | 5 +++++ include/hexdump.h | 2 +- include/httpboot.h | 6 +++--- include/netboot.h | 7 ++++--- include/replacements.h | 2 +- include/security_policy.h | 6 +++--- include/shell.h | 5 +++++ include/simple_file.h | 5 +++++ include/tpm.h | 5 +++++ include/variables.h | 6 +++++- include/version.h | 8 -------- include/wincert.h | 6 +++--- 23 files changed, 80 insertions(+), 48 deletions(-) delete mode 100644 include/version.h (limited to 'include/errors.h') 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 @@ -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 @@ -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 @@ -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 //*********************************************************************** // 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 #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 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 #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 +#ifndef SHIM_VARIABLES_H +#define SHIM_VARIABLES_H +#include #include /* 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 */ -- cgit v1.2.3 From aedb8470bd673385139ac3189ecd9edf4794af16 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Dec 2020 15:54:55 -0500 Subject: Fix up a bunch of our license statements and add SPDX most places The license statements in our source files were getting to be a giant mess, and mostly they all just say the same thing. I've switched most of it to SPDX labels, but left copyright statements in place (where they were not obviously incorrect copy-paste jobs that I did...). If there's some change here you don't think is valid, let me know and we can fix it up together. Signed-off-by: Peter Jones --- MokManager.c | 2 ++ PasswordCrypt.c | 2 ++ buildid.c | 2 ++ cert.S | 1 + errlog.c | 4 +++- fallback.c | 9 +++------ httpboot.c | 27 ++------------------------- include/asm.h | 5 +---- include/compiler.h | 5 +---- include/configtable.h | 2 ++ include/console.h | 2 ++ include/efiauthenticated.h | 2 ++ include/errors.h | 2 ++ include/execute.h | 2 ++ include/guid.h | 2 ++ include/hexdump.h | 2 ++ include/http.h | 31 +++++++++++-------------------- include/httpboot.h | 26 +------------------------- include/ip4config2.h | 23 +++++++---------------- include/ip6config.h | 21 +++++++-------------- include/netboot.h | 2 ++ include/passwordcrypt.h | 2 ++ include/peimage.h | 33 +++++++++++++-------------------- include/replacements.h | 30 ++++-------------------------- include/security_policy.h | 2 ++ include/shell.h | 2 ++ include/simple_file.h | 2 ++ include/str.h | 2 ++ include/tpm.h | 2 ++ include/ucs2.h | 36 ++++-------------------------------- include/variables.h | 2 ++ include/wincert.h | 2 ++ model.c | 4 ++-- mok.c | 3 ++- netboot.c | 30 ++++-------------------------- replacements.c | 32 ++------------------------------ shim.c | 30 ++++-------------------------- shim.h | 2 ++ tpm.c | 2 ++ version.c.in | 1 + version.h | 2 ++ 41 files changed, 117 insertions(+), 278 deletions(-) (limited to 'include/errors.h') diff --git a/MokManager.c b/MokManager.c index 9bae3414..9fab00d3 100644 --- a/MokManager.c +++ b/MokManager.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #include #include #include diff --git a/PasswordCrypt.c b/PasswordCrypt.c index 2eb971dd..311c914b 100644 --- a/PasswordCrypt.c +++ b/PasswordCrypt.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #include #include #include diff --git a/buildid.c b/buildid.c index 6b414cdc..ba7950fc 100644 --- a/buildid.c +++ b/buildid.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + /* * Walk a list of input files, printing the name and buildid of any file * that has one. diff --git a/cert.S b/cert.S index e636fcbb..36970330 100644 --- a/cert.S +++ b/cert.S @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent #if defined(VENDOR_DB_FILE) && defined(VENDOR_CERT_FILE) # error both VENDOR_DB_FILE and VENDOR_CERT_FILE have been configured diff --git a/errlog.c b/errlog.c index 08f7a82a..714d09d3 100644 --- a/errlog.c +++ b/errlog.c @@ -1,7 +1,9 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* * errlog.c - * Copyright 2017 Peter Jones + * Copyright Peter Jones */ + #include "shim.h" #include "hexdump.h" diff --git a/fallback.c b/fallback.c index 206c173d..c006cc58 100644 --- a/fallback.c +++ b/fallback.c @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* - * Copyright 2012-2013 Red Hat, Inc. - * All rights reserved. - * - * See "COPYING" for license terms. - * - * Author(s): Peter Jones + * Copyright Red Hat, Inc. + * Copyright Peter Jones */ #include diff --git a/httpboot.c b/httpboot.c index 2d27e8ed..7b976365 100644 --- a/httpboot.c +++ b/httpboot.c @@ -1,31 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + /* * Copyright 2015 SUSE LINUX GmbH * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * * Significant portions of this code are derived from Tianocore * (http://tianocore.sf.net) and are Copyright 2009-2012 Intel * Corporation. diff --git a/include/asm.h b/include/asm.h index 5e8f9ed9..8458d5d2 100644 --- a/include/asm.h +++ b/include/asm.h @@ -1,7 +1,4 @@ -/* - * asm.h - * Copyright 2018 Peter Jones - */ +// SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef SHIM_ASM_H_ #define SHIM_ASM_H_ diff --git a/include/compiler.h b/include/compiler.h index 163b3df2..48ec009a 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -1,7 +1,4 @@ -/* - * compiler.h - * Copyright 2019 Peter Jones - */ +// SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef COMPILER_H_ #define COMPILER_H_ diff --git a/include/configtable.h b/include/configtable.h index 0c9dfdca..5e201fbe 100644 --- a/include/configtable.h +++ b/include/configtable.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_CONFIGTABLE_H #define SHIM_CONFIGTABLE_H diff --git a/include/console.h b/include/console.h index b99004c6..65005f83 100644 --- a/include/console.h +++ b/include/console.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_CONSOLE_H #define SHIM_CONSOLE_H diff --git a/include/efiauthenticated.h b/include/efiauthenticated.h index 7c683e36..f2bcefdb 100644 --- a/include/efiauthenticated.h +++ b/include/efiauthenticated.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_EFIAUTHENTICATED_H #define SHIM_EFIAUTHENTICATED_H diff --git a/include/errors.h b/include/errors.h index 21978bd8..1c6cf528 100644 --- a/include/errors.h +++ b/include/errors.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_ERRORS_H #define SHIM_ERRORS_H diff --git a/include/execute.h b/include/execute.h index 18d2fa29..23d17728 100644 --- a/include/execute.h +++ b/include/execute.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_LIB_EXECUTE_H #define SHIM_LIB_EXECUTE_H diff --git a/include/guid.h b/include/guid.h index 91b14d96..114e8707 100644 --- a/include/guid.h +++ b/include/guid.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_GUID_H #define SHIM_GUID_H diff --git a/include/hexdump.h b/include/hexdump.h index de209ec5..8b8b4557 100644 --- a/include/hexdump.h +++ b/include/hexdump.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef STATIC_HEXDUMP_H #define STATIC_HEXDUMP_H diff --git a/include/http.h b/include/http.h index 4b3746a7..c89047db 100644 --- a/include/http.h +++ b/include/http.h @@ -1,23 +1,14 @@ -/** @file - This file defines the EFI HTTP Protocol interface. It is split into - the following two main sections: - HTTP Service Binding Protocol (HTTPSB) - HTTP Protocol (HTTP) - - Copyright (c) 2016, Intel Corporation. All rights reserved.
- (C) Copyright 2015 Hewlett Packard Enterprise Development LP
- This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - @par Revision Reference: - This Protocol is introduced in UEFI Specification 2.5 - -**/ +// SPDX-License-Identifier: BSD-2-Clause-Patent + +/* + * This file defines the EFI HTTP Protocol interface. It is split into + * the following two main sections: + * HTTP Service Binding Protocol (HTTPSB) + * HTTP Protocol (HTTP) + * + * Copyright (c) 2016, Intel Corporation. All rights reserved. + * Copyright 2015 Hewlett Packard Enterprise Development LP + */ #ifndef SHIM_HTTP_H #define SHIM_HTTP_H diff --git a/include/httpboot.h b/include/httpboot.h index b47f6a9d..ea9c57fe 100644 --- a/include/httpboot.h +++ b/include/httpboot.h @@ -1,31 +1,7 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* * Copyright 2015 SUSE LINUX GmbH * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * * Significant portions of this code are derived from Tianocore * (http://tianocore.sf.net) and are Copyright 2009-2012 Intel * Corporation. diff --git a/include/ip4config2.h b/include/ip4config2.h index efacaf83..0955bc26 100644 --- a/include/ip4config2.h +++ b/include/ip4config2.h @@ -1,20 +1,11 @@ -/** @file - This file provides a definition of the EFI IPv4 Configuration II - Protocol. +// SPDX-License-Identifier: BSD-2-Clause-Patent -Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -@par Revision Reference: -This Protocol is introduced in UEFI Specification 2.5 - -**/ +/* + * This file provides a definition of the EFI IPv4 Configuration II + * Protocol. + * + * Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. + */ #ifndef SHIM_IP4CONFIG2_H #define SHIM_IP4CONFIG2_H diff --git a/include/ip6config.h b/include/ip6config.h index f99ce013..8d9025b7 100644 --- a/include/ip6config.h +++ b/include/ip6config.h @@ -1,17 +1,10 @@ -/** @file - This file provides a definition of the EFI IPv6 Configuration - Protocol. - -Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ +// SPDX-License-Identifier: BSD-2-Clause-Patent +/* + * This file provides a definition of the EFI IPv6 Configuration + * Protocol. + * + * Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved. + */ #ifndef SHIM_IP6CONFIG_H #define SHIM_IP6CONFIG_H diff --git a/include/netboot.h b/include/netboot.h index d1ad1257..98b174a3 100644 --- a/include/netboot.h +++ b/include/netboot.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_NETBOOT_H #define SHIM_NETBOOT_H diff --git a/include/passwordcrypt.h b/include/passwordcrypt.h index cadad727..4c0e3607 100644 --- a/include/passwordcrypt.h +++ b/include/passwordcrypt.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_PASSWORDCRYPT_H #define SHIM_PASSWORDCRYPT_H diff --git a/include/peimage.h b/include/peimage.h index 49b89ae0..3b3f01a7 100644 --- a/include/peimage.h +++ b/include/peimage.h @@ -1,23 +1,16 @@ -/** @file - EFI image format for PE32, PE32+ and TE. Please note some data structures are - different for PE32 and PE32+. EFI_IMAGE_NT_HEADERS32 is for PE32 and - EFI_IMAGE_NT_HEADERS64 is for PE32+. - - This file is coded to the Visual Studio, Microsoft Portable Executable and - Common Object File Format Specification, Revision 8.0 - May 16, 2006. - This file also includes some definitions in PI Specification, Revision 1.0. - -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
-Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
-This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ +// SPDX-License-Identifier: BSD-2-Clause-Patent +/* + * EFI image format for PE32, PE32+ and TE. Please note some data structures + * are different for PE32 and PE32+. EFI_IMAGE_NT_HEADERS32 is for PE32 and + * EFI_IMAGE_NT_HEADERS64 is for PE32+. + * + * This file is coded to the Visual Studio, Microsoft Portable Executable and + * Common Object File Format Specification, Revision 8.0 - May 16, 2006. This + * file also includes some definitions in PI Specification, Revision 1.0. + * + * Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved. + * Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved. + */ #ifndef SHIM_PEIMAGE_H #define SHIM_PEIMAGE_H diff --git a/include/replacements.h b/include/replacements.h index ab2a5a58..8b35c857 100644 --- a/include/replacements.h +++ b/include/replacements.h @@ -1,30 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + /* - * Copyright 2013 Red Hat, Inc - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright Red Hat, Inc + * Copyright Peter Jones */ #ifndef SHIM_REPLACEMENTS_H #define SHIM_REPLACEMENTS_H diff --git a/include/security_policy.h b/include/security_policy.h index 7cfbfd03..e03653d2 100644 --- a/include/security_policy.h +++ b/include/security_policy.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_SECURITY_POLICY_H #define SHIM_SECURITY_POLICY_H diff --git a/include/shell.h b/include/shell.h index fec50137..579a92f5 100644 --- a/include/shell.h +++ b/include/shell.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_SHELL_H #define SHIM_SHELL_H diff --git a/include/simple_file.h b/include/simple_file.h index 7b019654..b3976626 100644 --- a/include/simple_file.h +++ b/include/simple_file.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_SIMPLE_FILE_H #define SHIM_SIMPLE_FILE_H diff --git a/include/str.h b/include/str.h index baa260e3..eee83369 100644 --- a/include/str.h +++ b/include/str.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_STR_H #define SHIM_STR_H diff --git a/include/tpm.h b/include/tpm.h index 4e33faaf..d5245875 100644 --- a/include/tpm.h +++ b/include/tpm.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_TPM_H #define SHIM_TPM_H diff --git a/include/ucs2.h b/include/ucs2.h index 806774c7..e43c341f 100644 --- a/include/ucs2.h +++ b/include/ucs2.h @@ -1,36 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* - * shim - trivial UEFI first-stage bootloader - * - * Copyright 2013 Red Hat, Inc - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Significant portions of this code are derived from Tianocore - * (http://tianocore.sf.net) and are Copyright 2009-2012 Intel - * Corporation. + * ucs2.h - UCS-2 string functions + * Copyright Red Hat, Inc + * Copyright Peter Jones */ #ifndef SHIM_UCS2_H diff --git a/include/variables.h b/include/variables.h index 2a957036..0f2e17fd 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_VARIABLES_H #define SHIM_VARIABLES_H diff --git a/include/wincert.h b/include/wincert.h index a3ce12a2..5b6c1fb0 100644 --- a/include/wincert.h +++ b/include/wincert.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_WINCERT_H #define SHIM_WINCERT_H diff --git a/model.c b/model.c index d0bfa543..50e3f0da 100644 --- a/model.c +++ b/model.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* * model.c - modeling file for coverity - * Copyright 2017 Peter Jones - * + * Copyright Peter Jones */ #ifndef __COVERITY__ diff --git a/mok.c b/mok.c index c3421457..fafcf9f0 100644 --- a/mok.c +++ b/mok.c @@ -1,5 +1,6 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* - * mok.c + * mok.c - MoK variable processing * Copyright 2017 Peter Jones */ diff --git a/netboot.c b/netboot.c index 047dad3a..ec13c64a 100755 --- a/netboot.c +++ b/netboot.c @@ -1,32 +1,10 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + /* * netboot - trivial UEFI first-stage bootloader netboot support * - * Copyright 2012 Red Hat, Inc - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright Red Hat, Inc + * Author: Matthew Garrett * * Significant portions of this code are derived from Tianocore * (http://tianocore.sf.net) and are Copyright 2009-2012 Intel diff --git a/replacements.c b/replacements.c index 4a8a46a5..c64c8d13 100644 --- a/replacements.c +++ b/replacements.c @@ -1,36 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent /* * shim - trivial UEFI first-stage bootloader * - * Copyright 2012 Red Hat, Inc - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Significant portions of this code are derived from Tianocore - * (http://tianocore.sf.net) and are Copyright 2009-2012 Intel - * Corporation. + * Copyright Red Hat, Inc */ /* Chemical agents lend themselves to covert use in sabotage against diff --git a/shim.c b/shim.c index d8a4d594..1cd9584c 100644 --- a/shim.c +++ b/shim.c @@ -1,32 +1,10 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + /* * shim - trivial UEFI first-stage bootloader * - * Copyright 2012 Red Hat, Inc - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright Red Hat, Inc + * Author: Matthew Garrett * * Significant portions of this code are derived from Tianocore * (http://tianocore.sf.net) and are Copyright 2009-2012 Intel diff --git a/shim.h b/shim.h index 337234e4..fe750e46 100644 --- a/shim.h +++ b/shim.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef SHIM_H_ #define SHIM_H_ diff --git a/tpm.c b/tpm.c index 03cf3a1f..4b9d0d92 100644 --- a/tpm.c +++ b/tpm.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #include #include #include diff --git a/version.c.in b/version.c.in index 06f91f93..71509cdf 100644 --- a/version.c.in +++ b/version.c.in @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent #include "version.h" diff --git a/version.h b/version.h index 7fb3d81b..254fea49 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef _SHIM_VERSION_H #define _SHIM_VERSION_H 1 -- cgit v1.2.3