From 6a83fc073d9d44d491ca13ec8d0e51a761bbb10a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 10 Mar 2021 14:48:10 +0100 Subject: [PATCH] tpmd2: Add copyright blurbs. -- Confirmed by James Bottomley; see https://lists.gnupg.org/pipermail/gnupg-devel/2021-March/034755.html Signed-off-by: Werner Koch --- AUTHORS | 1 + tpm2d/Makefile.am | 19 +++++++++++++++++++ tpm2d/command.c | 1 + tpm2d/ibm-tss.h | 19 +++++++++++++++++-- tpm2d/tpm2.c | 20 ++++++++++++++++++++ tpm2d/tpm2.h | 24 ++++++++++++++++++++++-- tpm2d/tpm2daemon.c | 1 + tpm2d/tpm2daemon.h | 6 ++++-- 8 files changed, 85 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6980407e5..71644c967 100644 --- a/AUTHORS +++ b/AUTHORS @@ -33,6 +33,7 @@ List of Copyright holders Copyright (C) 2000 Dimitrios Souflis Copyright (C) 2008,2009,2010,2012-2016 William Ahern Copyright (C) 2017 Bundesamt für Sicherheit in der Informationstechnik + Copyright (C) 2021 James Bottomley Authors with a FSF copyright assignment diff --git a/tpm2d/Makefile.am b/tpm2d/Makefile.am index 56a9ab7c9..bf5acd452 100644 --- a/tpm2d/Makefile.am +++ b/tpm2d/Makefile.am @@ -1,3 +1,22 @@ +# Makfile.am - Makefile for tpm2d +# Copyright (C) 2021 James Bottomley +# +# This file is part of GnuPG. +# +# GnuPG is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# GnuPG is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# SPDX-License-Identifier: GPL-3.0-or-later + AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am diff --git a/tpm2d/command.c b/tpm2d/command.c index 619bb56e6..351781111 100644 --- a/tpm2d/command.c +++ b/tpm2d/command.c @@ -16,6 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ #include diff --git a/tpm2d/ibm-tss.h b/tpm2d/ibm-tss.h index 2a4961359..4ca49a6cf 100644 --- a/tpm2d/ibm-tss.h +++ b/tpm2d/ibm-tss.h @@ -1,8 +1,23 @@ -/* +/* ibm-tss.h - Supporting TPM routines for the IBM TSS * Copyright (C) 2021 James Bottomley * - * Supporting TPM routines for the IBM TSS + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ + #ifndef _TPM2_IBM_TSS_H #define _TPM2_IBM_TSS_H diff --git a/tpm2d/tpm2.c b/tpm2d/tpm2.c index 2bd3dc177..3e908ddb1 100644 --- a/tpm2d/tpm2.c +++ b/tpm2d/tpm2.c @@ -1,3 +1,23 @@ +/* tpm2.c - Supporting TPM routines for the IBM TSS + * Copyright (C) 2021 James Bottomley + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * SPDX-License-Identifier: GPL-3.0-or-later + */ + #include #include #include diff --git a/tpm2d/tpm2.h b/tpm2d/tpm2.h index a2d3745ea..f2fa89ed9 100644 --- a/tpm2d/tpm2.h +++ b/tpm2d/tpm2.h @@ -1,5 +1,25 @@ -#ifndef _TPM2_H -#define _TPM2_H +/* tpm2.h - Definitions for supporting TPM routines for the IBM TSS + * Copyright (C) 2021 James Bottomley + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#ifndef _GNUPG_TPM2_H +#define _GNUPG_TPM2_H #include "../common/util.h" #include "ibm-tss.h" diff --git a/tpm2d/tpm2daemon.c b/tpm2d/tpm2daemon.c index 4ec6d7959..261896cc2 100644 --- a/tpm2d/tpm2daemon.c +++ b/tpm2d/tpm2daemon.c @@ -16,6 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ #include diff --git a/tpm2d/tpm2daemon.h b/tpm2d/tpm2daemon.h index 24d56a8dc..095978a5b 100644 --- a/tpm2d/tpm2daemon.h +++ b/tpm2d/tpm2daemon.h @@ -1,5 +1,6 @@ -/* tpm2daemon.h - Global definitions for the SCdaemon - * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +/* tpm2daemon.h - Global definitions for the TPM2D + * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + * Copyright (C) 2021 James Bottomley * * This file is part of GnuPG. * @@ -15,6 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ #ifndef TPM2DAEMON_H