Change license to LGPL-2.0-or-later and GPL-2.0-or-later

Currently libimaevm provided by this project is used by the tool evmctl, which is also provided by this project. An issue was reported about using libimaevm with other software. Its GPL2-only license makes it incompatible to use with other licenses, in particular GPL3-only. To address this issue, change the project license to GPL-2.0-or-later and libimaevm to LGPL 2.0 or later. This patch includes all acks. Link: https://lore.kernel.org/linux-integrity/9205ed32da8814d8c4d9bde5a03d92c7588f1d9a.1708503094.git.dmitry.kasatkin@gmail.com Link: https://lore.kernel.org/linux-integrity/103252ffff09c607e83c887cab2e0af5404d62ff.1710774200.git.dmitry.kasatkin@gmail.com Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@gmail.com> Acked-by: Dmitry Kasatkin <dmitry.kasatkin@huawei.com> Acked-by: Petr Vorel <pvorel@suse.cz> Acked-by: Mimi Zohar <zohar@linux.ibm.com> # all IBM contributions Acked-by: Stefan Berger <stefanb@linux.ibm.com> Acked-by: Vitaly Chikunov <vt@altlinux.org> Acked-by: Ken Goldman <kgold@linux.ibm.com> Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com> Acked-by: Bruno Meneguele <bmeneg@redhat.com> Acked-by: Roberto Sassu <roberto.sassu@huawei.com> Acked-by: George Wilson <gcwilson@linux.ibm.com> Acked-by: Tergel Myanganbayar <tergelmyanganbayar2024@u.northwestern.edu> Acked-by: André Draszik <git@andred.net> Acked-by: Frank Sorenson <sorenson@redhat.com> Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com> Acked-by: Vivek Goyal <vgoyal@redhat.com> Acked-by: Alberto Mardegan <a.mardegan@omp.ru> Acked-by: Eric Biggers <ebiggers@google.com> # all Google contributions Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Patrick Uiterwijk <patrick@puiterwijk.org> Acked-by: Kai Svahn <kai.svahn@linux.intel.com> # all Intel contributions Acked-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> Acked-by: yh00.jung@samsung.com # all Samsung contributions Acked-by: dmitry.kasatkin@gmail.com # all Samsung contributions with consent from Samsung corporation
mimizohar · Jun 26, 2024 · 6adc50f · 6adc50f
1 parent 0f3a00e
commit 6adc50f
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 511 deletions.
diff --git a/COPYING b/COPYING
diff --git a/LICENSES.txt b/LICENSES.txt
@@ -0,0 +1,13 @@
+ima-evm-utils is provided under following licenses:
+
+libimaevm is provided under:
+
+	SPDX-License-Identifier: LGPL-2.0-or-later
+
+	https://spdx.org/licenses/LGPL-2.0-or-later.html
+
+evmctl is provided under:
+
+	SPDX-License-Identifier: GPL-2.0-or-later
+
+	https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/src/evmctl.c b/src/evmctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * ima-evm-utils - IMA/EVM support utilities
  *
@@ -10,30 +11,6 @@
  *                 <dmitry.kasatkin@intel.com>
  *                 <d.kasatkin@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 <http://www.gnu.org/licenses/>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the GNU General Public License in all respects
- * for all of the code used other than as permitted herein. If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version. If you
- * delete this exception statement from all source files in the program,
- * then also delete it in the license file.
- *
  * File: evmctl.c
  *	 IMA/EVM control program
  */

diff --git a/src/hash_info.gen b/src/hash_info.gen
@@ -1,18 +1,10 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Generate hash_info.h from kernel headers
 #
 # Copyright (C) 2018 <vt@altlinux.org>
 #
-# This program 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 2, or (at your option)
-# any later version.
-#
-# This program 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.
 
 KERNEL_HEADERS=$1
 HASH_INFO_H=uapi/linux/hash_info.h

diff --git a/src/imaevm.h b/src/imaevm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.0-or-later */
 /*
  * ima-evm-utils - IMA/EVM support utilities
  *
@@ -10,30 +11,6 @@
  *                 <dmitry.kasatkin@intel.com>
  *                 <d.kasatkin@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 <http://www.gnu.org/licenses/>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the GNU General Public License in all respects
- * for all of the code used other than as permitted herein. If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version. If you
- * delete this exception statement from all source files in the program,
- * then also delete it in the license file.
- *
  * File: imaevm.h
  *	 IMA/EVM header file
  */

diff --git a/src/libimaevm.c b/src/libimaevm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-2.0-or-later
 /*
  * ima-evm-utils - IMA/EVM support utilities
  *
@@ -10,30 +11,6 @@
  *                 <dmitry.kasatkin@intel.com>
  *                 <d.kasatkin@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 <http://www.gnu.org/licenses/>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the GNU General Public License in all respects
- * for all of the code used other than as permitted herein. If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version. If you
- * delete this exception statement from all source files in the program,
- * then also delete it in the license file.
- *
  * File: libimaevm.c
  *	 IMA/EVM library
  */

diff --git a/src/pcr.h b/src/pcr.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 int tpm2_pcr_supported(void);
 int tpm2_pcr_read(const char *algo_name, uint32_t pcr_handle, uint8_t *hwpcr,
 		 int len, char **errmsg);
diff --git a/src/pcr_ibmtss.c b/src/pcr_ibmtss.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Support PCR reading implementation based on IBM TSS2
  *

diff --git a/src/pcr_tss.c b/src/pcr_tss.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * ima-evm-utils - IMA/EVM support utilities
  *
@@ -10,30 +11,6 @@
  *                 <dmitry.kasatkin@intel.com>
  *                 <d.kasatkin@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 <http://www.gnu.org/licenses/>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the GNU General Public License in all respects
- * for all of the code used other than as permitted herein. If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version. If you
- * delete this exception statement from all source files in the program,
- * then also delete it in the license file.
- *
  * File: pcr_tss.c
  *	 PCR reading implementation based on Intel TSS2
  */

diff --git a/src/pcr_tsspcrread.c b/src/pcr_tsspcrread.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * ima-evm-utils - IMA/EVM support utilities
  *
@@ -10,30 +11,6 @@
  *                 <dmitry.kasatkin@intel.com>
  *                 <d.kasatkin@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program 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 <http://www.gnu.org/licenses/>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the GNU General Public License in all respects
- * for all of the code used other than as permitted herein. If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version. If you
- * delete this exception statement from all source files in the program,
- * then also delete it in the license file.
- *
  * File: pcr_tsspcrread.c
  *	 PCR reading implementation based on IBM TSS2
  */

diff --git a/src/utils.c b/src/utils.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * utils: set of common functions
  *

diff --git a/src/utils.h b/src/utils.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 #include <ctype.h>
 #include <sys/types.h>
 

diff --git a/tests/functions.sh b/tests/functions.sh
@@ -1,19 +1,10 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # ima-evm-utils tests bash functions
 #
 # Copyright (C) 2020 Vitaly Chikunov <vt@altlinux.org>
 #
-# This program 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 2, or (at your option)
-# any later version.
-#
-# This program 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.
 
 # Tests accounting
 declare -i testspass=0 testsfail=0 testsskip=0

diff --git a/tests/gen-keys.sh b/tests/gen-keys.sh
@@ -1,19 +1,10 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Generate keys for the tests
 #
 # Copyright (C) 2020 Vitaly Chikunov <vt@altlinux.org>
 #
-# This program 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 2, or (at your option)
-# any later version.
-#
-# This program 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.
 
 # shellcheck disable=SC2043
 

diff --git a/tests/ima_hash.test b/tests/ima_hash.test
@@ -1,19 +1,10 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # evmctl ima_hash tests
 #
 # Copyright (C) 2020 Vitaly Chikunov <vt@altlinux.org>
 #
-# This program 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 2, or (at your option)
-# any later version.
-#
-# This program 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.
 
 cd "$(dirname "$0")" || exit 1
 PATH=../src:$PATH

diff --git a/tests/sign_verify.test b/tests/sign_verify.test
@@ -1,19 +1,10 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # evmctl {,ima_}{sign,verify} tests
 #
 # Copyright (C) 2020 Vitaly Chikunov <vt@altlinux.org>
 #
-# This program 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 2, or (at your option)
-# any later version.
-#
-# This program 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.
 
 cd "$(dirname "$0")" || exit 1
 PATH=../src:$PATH

diff --git a/tests/test_mmap.c b/tests/test_mmap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2023 Huawei Technologies Duesseldorf GmbH
  *