Fix up a bunch of our license statements and add SPDX most places

vathpela · martinezjavier · commit aedb8470bd67 · 2021-02-16T09:12:48.000+01:00
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 &lt;pjones@redhat.com&gt;
diff --git a/MokManager.c b/MokManager.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
+
 #include <efi.h>
 #include <efilib.h>
 #include <stdarg.h>
diff --git a/PasswordCrypt.c b/PasswordCrypt.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
+
 #include <efi.h>
 #include <efilib.h>
 #include <Library/BaseCryptLib.h>
diff --git 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
@@ -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
@@ -1,7 +1,9 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * errlog.c
- * Copyright 2017 Peter Jones <pjones@redhat.com>
+ * Copyright Peter Jones <pjones@redhat.com>
  */
+
 #include "shim.h"
 #include "hexdump.h"
 
diff --git 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 <pjones@redhat.com>
+ * Copyright Red Hat, Inc.
+ * Copyright Peter Jones <pjones@redhat.com>
  */
 
 #include <efi.h>
diff --git a/httpboot.c b/httpboot.c
@@ -1,31 +1,8 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
+
 /*
  * Copyright 2015 SUSE LINUX GmbH <glin@suse.com>
  *
- * 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
@@ -1,7 +1,4 @@
-/*
- * asm.h
- * Copyright 2018 Peter Jones <pjones@redhat.com>
- */
+// 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
@@ -1,7 +1,4 @@
-/*
- * compiler.h
- * Copyright 2019 Peter Jones <pjones@redhat.com>
- */
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #ifndef COMPILER_H_
 #define COMPILER_H_
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.<BR>
-  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
-  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
@@ -1,31 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2015 SUSE LINUX GmbH <glin@suse.com>
  *
- * 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
@@ -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.<BR>
-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<BR>
-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
@@ -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.<BR>
-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<BR>
-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
@@ -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
@@ -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
@@ -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.<BR>
-Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
-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
@@ -1,30 +1,8 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
+
 /*
- * Copyright 2013 Red Hat, Inc <pjones@redhat.com>
- *
- * 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 <pjones@redhat.com>
  */
 #ifndef SHIM_REPLACEMENTS_H
 #define SHIM_REPLACEMENTS_H
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/include/variables.h b/include/variables.h
diff --git a/include/wincert.h b/include/wincert.h
diff --git a/model.c b/model.c
diff --git a/mok.c b/mok.c
diff --git a/netboot.c b/netboot.c
diff --git a/replacements.c b/replacements.c
diff --git a/shim.c b/shim.c
diff --git a/shim.h b/shim.h
diff --git a/tpm.c b/tpm.c
diff --git a/version.c.in b/version.c.in
diff --git a/version.h b/version.h

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#include <efi.h>`
`2`	`4`	`#include <efilib.h>`
`3`	`5`	`#include <stdarg.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`/*`
`2`	`4`	`* Walk a list of input files, printing the name and buildid of any file`
`3`	`5`	`* that has one.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
`1`	`2`
`2`	`3`	`#if defined(VENDOR_DB_FILE) && defined(VENDOR_CERT_FILE)`
`3`	`4`	`# error both VENDOR_DB_FILE and VENDOR_CERT_FILE have been configured`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef SHIM_CONFIGTABLE_H`
`2`	`4`	`#define SHIM_CONFIGTABLE_H`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef SHIM_CONSOLE_H`
`2`	`4`	`#define SHIM_CONSOLE_H`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef SHIM_EFIAUTHENTICATED_H`
`2`	`4`	`#define SHIM_EFIAUTHENTICATED_H`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef SHIM_ERRORS_H`
`2`	`4`	`#define SHIM_ERRORS_H`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef SHIM_LIB_EXECUTE_H`
`2`	`4`	`#define SHIM_LIB_EXECUTE_H`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef SHIM_GUID_H`
`2`	`4`	`#define SHIM_GUID_H`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// SPDX-License-Identifier: BSD-2-Clause-Patent`
	`2`	`+`
`1`	`3`	`#ifndef STATIC_HEXDUMP_H`
`2`	`4`	`#define STATIC_HEXDUMP_H`
`3`	`5`