Change in coreboot[master]: src/[drivers|security]: Update headers refering to BSD license
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36183 )
Change subject: src/[drivers|security]: Update headers refering to BSD license ......................................................................
src/[drivers|security]: Update headers refering to BSD license
Add a BSD 3-clause license file into the coreboot/LICENSES directory. This will have additional licenses added shortly.
Update text of headers referring to the LICENSE file to refer to the BSD-3-Clause license in this directory.
Add the coreboot project line to each header.
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: Ia2ae0f32e62271102acaa9af7f0e0e5376f7c565 --- A LICENSES/BSD-3-Clause.txt M src/drivers/crb/tpm.c M src/drivers/crb/tpm.h M src/drivers/spi/tpm/tis.c M src/drivers/spi/tpm/tpm.c M src/drivers/spi/tpm/tpm.h M src/drivers/vpd/vpd.c M src/drivers/vpd/vpd.h M src/drivers/vpd/vpd_cbmem.c M src/drivers/vpd/vpd_decode.c M src/drivers/vpd/vpd_decode.h M src/drivers/vpd/vpd_tables.h M src/security/tpm/tss.h M src/security/tpm/tss/tcg-1.2/tss.c M src/security/tpm/tss/tcg-1.2/tss_internal.h M src/security/tpm/tss/tcg-1.2/tss_structures.h M src/security/tpm/tss/tcg-2.0/tss.c M src/security/tpm/tss/tcg-2.0/tss_marshaling.c M src/security/tpm/tss/tcg-2.0/tss_marshaling.h M src/security/tpm/tss/tcg-2.0/tss_structures.h M src/security/tpm/tss/vendor/cr50/cr50.c M src/security/tpm/tss_errors.h 22 files changed, 142 insertions(+), 49 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/36183/1
diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt new file mode 100644 index 0000000..0741db7 --- /dev/null +++ b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,26 @@ +Copyright (c) <year> <owner>. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. 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. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +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. diff --git a/src/drivers/crb/tpm.c b/src/drivers/crb/tpm.c index 0393417..d6ebbb5 100644 --- a/src/drivers/crb/tpm.c +++ b/src/drivers/crb/tpm.c @@ -1,6 +1,8 @@ -/*. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. +/* + * This file is part of the coreboot project. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. * * This is a driver for a CRB Interface. * diff --git a/src/drivers/crb/tpm.h b/src/drivers/crb/tpm.h index 9bbed19..e78b785 100644 --- a/src/drivers/crb/tpm.h +++ b/src/drivers/crb/tpm.h @@ -1,7 +1,9 @@ /* + * This file is part of the coreboot project. + * * 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. + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. * * This is a driver for a Command Response Buffer Interface */ diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tis.c index b50ab0a..9a6d3d1 100644 --- a/src/drivers/spi/tpm/tis.c +++ b/src/drivers/spi/tpm/tis.c @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#include <arch/early_variables.h> diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c index aad7610..028ebae 100644 --- a/src/drivers/spi/tpm/tpm.c +++ b/src/drivers/spi/tpm/tpm.c @@ -1,8 +1,13 @@ /* - * 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. + * This file is part of the coreboot project. * + * Copyright 2016 The Chromium OS Authors. All rights reserved. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES Directory. + */ + +/* * This is a driver for a SPI interfaced TPM2 device. * * It assumes that the required SPI interface has been initialized before the diff --git a/src/drivers/spi/tpm/tpm.h b/src/drivers/spi/tpm/tpm.h index 214d3bd..5081757 100644 --- a/src/drivers/spi/tpm/tpm.h +++ b/src/drivers/spi/tpm/tpm.h @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#ifndef __COREBOOT_SRC_DRIVERS_SPI_TPM_TPM_H diff --git a/src/drivers/vpd/vpd.c b/src/drivers/vpd/vpd.c index 10f5703..a031cef 100644 --- a/src/drivers/vpd/vpd.c +++ b/src/drivers/vpd/vpd.c @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * Copyright (c) 2014 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#include <arch/early_variables.h> diff --git a/src/drivers/vpd/vpd.h b/src/drivers/vpd/vpd.h index 14b002c..0fba9fd 100644 --- a/src/drivers/vpd/vpd.h +++ b/src/drivers/vpd/vpd.h @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * Copyright (c) 2014 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#ifndef __VPD_H__ diff --git a/src/drivers/vpd/vpd_cbmem.c b/src/drivers/vpd/vpd_cbmem.c index 5b68506..5ddf464 100644 --- a/src/drivers/vpd/vpd_cbmem.c +++ b/src/drivers/vpd/vpd_cbmem.c @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * Copyright (c) 2014 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#include <console/console.h> diff --git a/src/drivers/vpd/vpd_decode.c b/src/drivers/vpd/vpd_decode.c index 527c508..aad983a 100644 --- a/src/drivers/vpd/vpd_decode.c +++ b/src/drivers/vpd/vpd_decode.c @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * Copyright 2014 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. * * This is a copy from upstream: * https://chromium.googlesource.com/chromiumos/platform/vpd/+/master/lib/vpd_d... diff --git a/src/drivers/vpd/vpd_decode.h b/src/drivers/vpd/vpd_decode.h index 5d595f3..1a2ab68 100644 --- a/src/drivers/vpd/vpd_decode.h +++ b/src/drivers/vpd/vpd_decode.h @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * Copyright 2019 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. * * This is a copy from upstream: * https://chromium.googlesource.com/chromiumos/platform/vpd/+/master/include/l... diff --git a/src/drivers/vpd/vpd_tables.h b/src/drivers/vpd/vpd_tables.h index 4add5bd..ffe2e38 100644 --- a/src/drivers/vpd/vpd_tables.h +++ b/src/drivers/vpd/vpd_tables.h @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * Copyright (c) 2014 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. * * Ported from mosys project (http://code.google.com/p/mosys/). */ diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h index 336935d..ac5fcc4 100644 --- a/src/security/tpm/tss.h +++ b/src/security/tpm/tss.h @@ -1,7 +1,11 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +/* + * This file is part of the coreboot project. + * + * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
/* diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c index b11d6a3..15c685c 100644 --- a/src/security/tpm/tss/tcg-1.2/tss.c +++ b/src/security/tpm/tss/tcg-1.2/tss.c @@ -1,6 +1,10 @@ -/* 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. +/* + * This file is part of the coreboot project. + * + * Copyright (c) 2012 The Chromium OS Authors. All rights reserved. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
/* A lightweight TPM command library. 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 e999cb9..be337d8 100644 --- a/src/security/tpm/tss/tcg-1.2/tss_internal.h +++ b/src/security/tpm/tss/tcg-1.2/tss_internal.h @@ -1,6 +1,10 @@ -/* 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. +/* + * This file is part of the coreboot project. + * + * Copyright (c) 2010 The Chromium OS Authors. All rights reserved. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#ifndef 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 50fa3fb..37744eb 100644 --- a/src/security/tpm/tss/tcg-1.2/tss_structures.h +++ b/src/security/tpm/tss/tcg-1.2/tss_structures.h @@ -1,6 +1,10 @@ -/* 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. +/* + * This file is part of the coreboot project. + * + * Copyright (c) 2013 The Chromium OS Authors. All rights reserved. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. * * 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 16e40fe..dd1f702 100644 --- a/src/security/tpm/tss/tcg-2.0/tss.c +++ b/src/security/tpm/tss/tcg-2.0/tss.c @@ -1,8 +1,11 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#include <arch/early_variables.h> 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 1bf211a..b19483e 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_marshaling.c +++ b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c @@ -1,8 +1,11 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#include <arch/early_variables.h> 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 d34756d..0cf6388 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_marshaling.h +++ b/src/security/tpm/tss/tcg-2.0/tss_marshaling.h @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */ #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 1530613..fa97650 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_structures.h +++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#ifndef 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 4f128dc..c5e820c 100644 --- a/src/security/tpm/tss/vendor/cr50/cr50.c +++ b/src/security/tpm/tss/vendor/cr50/cr50.c @@ -1,7 +1,10 @@ /* + * This file is part of the coreboot project. + * * 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. + * + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
#include <arch/early_variables.h> diff --git a/src/security/tpm/tss_errors.h b/src/security/tpm/tss_errors.h index ed6fc3d..23b71e0 100644 --- a/src/security/tpm/tss_errors.h +++ b/src/security/tpm/tss_errors.h @@ -1,6 +1,9 @@ -/* 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. +/* + * This file is part of the coreboot project. + * + * Copyright (c) 2010 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by the BSD-3-Clause license that can be + * found in the LICENSES directory. */
/* TPM error codes.
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36183 )
Change subject: src/[drivers|security]: Update headers refering to BSD license ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36183/1/LICENSES/BSD-3-Clause.txt File LICENSES/BSD-3-Clause.txt:
PS1: Do we want to put other licenses in there as well? otherwise, why not {COPYING,LICENSE}.BSD-3-Clause (using its SPDX ID) in the top level directory?
Martin Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/36183 )
Change subject: src/[drivers|security]: Update headers refering to BSD license ......................................................................
Abandoned
-
Martin Roth (Code Review) -
Patrick Georgi (Code Review)