From fa8f567f3243e3d547a9e8388064a091ee294f98 Mon Sep 17 00:00:00 2001 From: Jacob Garber Date: Mon, 18 May 2020 13:18:19 -0600 Subject: security/tpm: Use SPDX identifiers Also adjust a few comments to follow the style guide. Change-Id: I22001320f2ce1f0db348e0f7fabc5a65b50ba53e Signed-off-by: Jacob Garber Reviewed-on: https://review.coreboot.org/c/coreboot/+/41600 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- LICENSES/retained-copyrights.txt | 4 ++++ src/security/tpm/tss.h | 6 +----- src/security/tpm/tss/tcg-1.2/tss.c | 11 +++++------ src/security/tpm/tss/tcg-1.2/tss_internal.h | 5 +---- src/security/tpm/tss/tcg-1.2/tss_structures.h | 7 +++---- src/security/tpm/tss/tcg-2.0/tss.c | 7 +------ src/security/tpm/tss/tcg-2.0/tss_marshaling.c | 7 +------ src/security/tpm/tss/tcg-2.0/tss_marshaling.h | 7 ++----- src/security/tpm/tss/tcg-2.0/tss_structures.h | 6 +----- src/security/tpm/tss/vendor/cr50/cr50.c | 6 +----- src/security/tpm/tss_errors.h | 8 +++----- 11 files changed, 23 insertions(+), 51 deletions(-) diff --git a/LICENSES/retained-copyrights.txt b/LICENSES/retained-copyrights.txt index 671f37f0a3..066bf6f7d0 100644 --- a/LICENSES/retained-copyrights.txt +++ b/LICENSES/retained-copyrights.txt @@ -11,6 +11,7 @@ Copyright 2015 Google Inc. Copyright 2015, Google Inc. Copyright 2016 Jonathan Neuschäfer Copyright 2016 The Chromium OS Authors. All rights reserved. +Copyright 2017-2019 Eltan B.V. Copyright 2017 Google Inc. Copyright 2018 Generated Code Copyright 2018-present Facebook, Inc. @@ -32,6 +33,7 @@ Copyright (c) 2010-2017, The Regents of the University of California Copyright (c) 2010, Code Aurora Forum. All rights reserved. Copyright (C) 2010 coresystems GmbH Copyright (c) 2010 Per Odlund +Copyright (c) 2010 The Chromium OS Authors. All rights reserved. Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. @@ -79,7 +81,9 @@ Copyright (C) 2015 Timothy Pearson , Raptor E Copyright (c) 2016, 2018, The Linux Foundation. All rights reserved. Copyright (C) 2016 Google Inc. Copyright (c) 2016, The Regents of the University of California (Regents). +Copyright (C) 2018-2019 Eltan B.V. Copyright (C) 2018 - 2019 The Linux Foundation. All rights reserved. +Copyright (c) 2018 Eltan B.V. Copyright (c) 2018, HardenedLinux. Copyright (C) 2018, The Linux Foundation. All rights reserved. Copyright Dave Airlie diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h index 57f3b24847..f644e3e7e7 100644 --- a/src/security/tpm/tss.h +++ b/src/security/tpm/tss.h @@ -1,8 +1,4 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Copyright (C) 2018-2019 Eltan B.V. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * TPM Lightweight Command Library. diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c index ea3f94d5f8..4434ca6983 100644 --- a/src/security/tpm/tss/tcg-1.2/tss.c +++ b/src/security/tpm/tss/tcg-1.2/tss.c @@ -1,9 +1,7 @@ -/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ -/* A lightweight TPM command library. +/* + * A lightweight TPM command library. * * The general idea is that TPM commands are array of bytes whose * fields are mostly compile-time constant. The goal is to build much @@ -75,7 +73,8 @@ static inline int tpm_return_code(const uint8_t *buffer) return tpm_command_code(buffer); } -/* Like TlclSendReceive below, but do not retry if NEEDS_SELFTEST or +/* + * Like TlclSendReceive below, but do not retry if NEEDS_SELFTEST or * DOING_SELFTEST errors are returned. */ static uint32_t tlcl_send_receive_no_retry(const uint8_t *request, diff --git a/src/security/tpm/tss/tcg-1.2/tss_internal.h b/src/security/tpm/tss/tcg-1.2/tss_internal.h index e999cb947f..1f49f041f4 100644 --- a/src/security/tpm/tss/tcg-1.2/tss_internal.h +++ b/src/security/tpm/tss/tcg-1.2/tss_internal.h @@ -1,7 +1,4 @@ -/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef TCG_TSS_INTERNAL_H_ #define TCG_TSS_INTERNAL_H_ diff --git a/src/security/tpm/tss/tcg-1.2/tss_structures.h b/src/security/tpm/tss/tcg-1.2/tss_structures.h index 50fa3fbf0c..4a976c810d 100644 --- a/src/security/tpm/tss/tcg-1.2/tss_structures.h +++ b/src/security/tpm/tss/tcg-1.2/tss_structures.h @@ -1,7 +1,6 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * +/* SPDX-License-Identifier: BSD-3-Clause */ + +/* * Some TPM constants and type definitions for standalone compilation for use * in the firmware */ diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c index 49a6cea083..79d8eb91b4 100644 --- a/src/security/tpm/tss/tcg-2.0/tss.c +++ b/src/security/tpm/tss/tcg-2.0/tss.c @@ -1,9 +1,4 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Copyright 2017-2019 Eltan B.V. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #include #include diff --git a/src/security/tpm/tss/tcg-2.0/tss_marshaling.c b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c index eff1acd2cd..f31c7d0178 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_marshaling.c +++ b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c @@ -1,9 +1,4 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Copyright (c) 2018 Eltan B.V. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #include #include diff --git a/src/security/tpm/tss/tcg-2.0/tss_marshaling.h b/src/security/tpm/tss/tcg-2.0/tss_marshaling.h index d34756d566..432cf5a382 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_marshaling.h +++ b/src/security/tpm/tss/tcg-2.0/tss_marshaling.h @@ -1,8 +1,5 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ + #ifndef TCG2_TSS_MARSHALING_H_ #define TCG2_TSS_MARSHALING_H_ diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h index 3f0c6545ab..f8c6012990 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_structures.h +++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h @@ -1,8 +1,4 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef TCG2_TSS_STRUCTURES_H_ #define TCG2_TSS_STRUCTURES_H_ diff --git a/src/security/tpm/tss/vendor/cr50/cr50.c b/src/security/tpm/tss/vendor/cr50/cr50.c index d7bf48d711..3be1e5a722 100644 --- a/src/security/tpm/tss/vendor/cr50/cr50.c +++ b/src/security/tpm/tss/vendor/cr50/cr50.c @@ -1,8 +1,4 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ #include #include diff --git a/src/security/tpm/tss_errors.h b/src/security/tpm/tss_errors.h index ed6fc3d77c..7c4e569397 100644 --- a/src/security/tpm/tss_errors.h +++ b/src/security/tpm/tss_errors.h @@ -1,9 +1,7 @@ -/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */ -/* TPM error codes. +/* + * TPM error codes. * * Copy-pasted and lightly edited from TCG TPM Main Part 2 TPM Structures * Version 1.2 Level 2 Revision 103 26 October 2006 Draft. -- cgit v1.2.3