From aedb8470bd673385139ac3189ecd9edf4794af16 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Dec 2020 15:54:55 -0500 Subject: [PATCH] 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 | 29 ++++++++++------------------- 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, 116 insertions(+), 277 deletions(-) diff --git a/MokManager.c b/MokManager.c index 9bae341..9fab00d 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 2eb971d..311c914 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 6b414cd..ba7950f 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 e636fcb..3697033 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 08f7a82..714d09d 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 206c173..c006cc5 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 2d27e8e..7b97636 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 5e8f9ed..8458d5d 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 163b3df..48ec009 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 0c9dfdc..5e201fb 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 b99004c..65005f8 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 7c683e3..f2bcefd 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 21978bd..1c6cf52 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 18d2fa2..23d1772 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 91b14d9..114e870 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 de209ec..8b8b455 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 4b3746a..c89047d 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) +// SPDX-License-Identifier: BSD-2-Clause-Patent - 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 - -**/ +/* + * 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 b47f6a9..ea9c57f 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 efacaf8..0955bc2 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 f99ce01..8d9025b 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 d1ad125..98b174a 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 cadad72..4c0e360 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 49b89ae..3b3f01a 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 ab2a5a5..8b35c85 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 7cfbfd0..e03653d 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 fec5013..579a92f 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 7b01965..b397662 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 baa260e..eee8336 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 4e33faa..d524587 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 806774c..e43c341 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 2a95703..0f2e17f 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 a3ce12a..5b6c1fb 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 d0bfa54..50e3f0d 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 c342145..fafcf9f 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 047dad3..ec13c64 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 4a8a46a..c64c8d1 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 d8a4d59..1cd9584 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 337234e..fe750e4 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 03cf3a1..4b9d0d9 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 06f91f9..71509cd 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 7fb3d81..254fea4 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