Skip to contentSkip to conversation

Switch to MIT license

PATCH In review Eric Biggers 3 participants 4 messages Jul 31, 2020 – Aug 1, 2020

Subsystems (5)
lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 Switch to MIT license

From: Eric Biggers <[email protected]>

This allows libfsverity to be used by software with other common licenses, e.g. LGPL, MIT, BSD, and Apache 2.0. It also avoids the incompatibility that some people perceive between OpenSSL and the GPL.

See discussion at
https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u

---
 .clang-format                  |   6 +-
 COPYING                        | 339 ---------------------------------
 LICENSE                        |  21 ++
 Makefile                       |   7 +-
 NEWS.md                        |   4 +
 README.md                      |   7 +-
 common/common_defs.h           |   6 +-
 common/libfsverity.h           |   6 +-
 lib/compute_digest.c           |   6 +-
 lib/hash_algs.c                |   6 +-
 lib/lib_private.h              |   6 +-
 lib/sign_digest.c              |   6 +-
 lib/utils.c                    |   6 +-
 programs/cmd_enable.c          |   6 +-
 programs/cmd_measure.c         |   6 +-
 programs/cmd_sign.c            |   6 +-
 programs/fsverity.c            |  18 +-
 programs/fsverity.h            |   6 +-
 programs/test_compute_digest.c |   6 +-
 programs/test_hash_algs.c      |   6 +-
 programs/test_sign_digest.c    |   6 +-
 programs/utils.c               |   6 +-
 programs/utils.h               |   6 +-
 scripts/do-release.sh          |   6 +-
 scripts/run-sparse.sh          |   6 +-
 scripts/run-tests.sh           |  17 +-
 26 files changed, 149 insertions(+), 378 deletions(-)
 delete mode 100644 COPYING
 create mode 100644 LICENSE
.clang-format +5 -1
index 2a21ac5..834d0a4 100644
@@ -1,6 +1,10 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: MIT
 # Copyright 2020 Google LLC
 #
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
 # Formatting settings to approximate the Linux kernel coding style.
 BasedOnStyle: LLVM
 AllowShortFunctionsOnASingleLine: false
COPYING deleted +0 -339

339 lines not on this page · raw message

LICENSE new file +21 -0
new file mode 100644
index 0000000..3211373
@@ -0,0 +1,21 @@
+Copyright 2019 the fsverity-utils authors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
Makefile +6 -1
index 7d7247c..e0a3938 100644
@@ -1,6 +1,11 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: MIT
 # Copyright 2020 Google LLC
 #
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
+
 # Use 'make help' to list available targets.
 #
 # Define V=1 to enable "verbose" mode, showing all executed commands.
NEWS.md +4 -0
index 695a760..e7f2d9d 100644
@@ -1,5 +1,9 @@
 # fsverity-utils release notes
 
+## Version 1.2
+
+* Changed license from GPL to MIT.
+
 ## Version 1.1
 
 * Split the file measurement computation and signing functionality
README.md +2 -5
index dfdaeaa..b11f6d5 100644
@@ -129,11 +129,8 @@ IMA support for fs-verity is planned.
 
 ## Notices
 
-This project is provided under the terms of the GNU General Public
-License, version 2; or at your option, any later version.  A copy of the
-GPLv2 can be found in the file named [COPYING](COPYING).
-
-Permission to link to OpenSSL (libcrypto) is granted.
+This project is provided under the terms of the MIT license.  A copy
+of this license can be found in the file named [LICENSE](LICENSE).
 
 Send questions and bug reports to [email protected].
 
common/common_defs.h +5 -1
index 4653281..279385a 100644
@@ -1,8 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: MIT */
 /*
  * Common definitions for libfsverity and the 'fsverity' program
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 #ifndef COMMON_COMMON_DEFS_H
 #define COMMON_COMMON_DEFS_H
common/libfsverity.h +5 -1
index 2330b4a..450f58e 100644
@@ -1,9 +1,13 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: MIT */
 /*
  * libfsverity API
  *
  * Copyright 2018 Google LLC
  * Copyright (C) 2020 Facebook
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #ifndef LIBFSVERITY_H
lib/compute_digest.c +5 -1
index 85de28e..e0b213b 100644
@@ -1,9 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Implementation of libfsverity_compute_digest().
  *
  * Copyright 2018 Google LLC
  * Copyright (C) 2020 Facebook
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "lib_private.h"
lib/hash_algs.c +5 -1
index a25ceb4..510ca3e 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * fs-verity hash algorithms
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "lib_private.h"
lib/lib_private.h +5 -1
index dc8448d..54f583e 100644
@@ -1,8 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: MIT */
 /*
  * Private header for libfsverity
  *
  * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 #ifndef LIB_LIB_PRIVATE_H
 #define LIB_LIB_PRIVATE_H
lib/sign_digest.c +5 -1
index af260af..1f73007 100644
@@ -1,9 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Implementation of libfsverity_sign_digest().
  *
  * Copyright 2018 Google LLC
  * Copyright (C) 2020 Facebook
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "lib_private.h"
lib/utils.c +5 -1
index 18cb34c..8b5d6cb 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Utility functions for libfsverity
  *
  * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #define _GNU_SOURCE /* for asprintf() and strerror_r() */
programs/cmd_enable.c +5 -1
index f1c0806..d90d208 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * The 'fsverity enable' command
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "fsverity.h"
programs/cmd_measure.c +5 -1
index 4e6cb2b..98382ab 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * The 'fsverity measure' command
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "fsverity.h"
programs/cmd_sign.c +5 -1
index 3381ca5..e1bbfd6 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * The 'fsverity sign' command
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "fsverity.h"
programs/fsverity.c +7 -11
index fe00559..95f6964 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * fs-verity userspace tool
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "fsverity.h"
@@ -84,16 +88,8 @@ void usage(const struct fsverity_command *cmd, FILE *fp)
 
 static void show_version(void)
 {
-	printf(
-"fsverity v%d.%d\n"
-"Copyright 2018 Google LLC\n"
-"License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>.\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-"\n"
-"Report bugs to [email protected].\n",
-		FSVERITY_UTILS_MAJOR_VERSION,
-		FSVERITY_UTILS_MINOR_VERSION);
+	printf("fsverity v%d.%d\n", FSVERITY_UTILS_MAJOR_VERSION,
+	       FSVERITY_UTILS_MINOR_VERSION);
 }
 
 static void handle_common_options(int argc, char *argv[],
programs/fsverity.h +5 -1
index 9f71ea7..fd9bc4a 100644
@@ -1,8 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: MIT */
 /*
  * Private header for the 'fsverity' program
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 #ifndef PROGRAMS_FSVERITY_H
 #define PROGRAMS_FSVERITY_H
programs/test_compute_digest.c +5 -1
index dc85d01..eee10f7 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Test libfsverity_compute_digest().
  *
  * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "utils.h"
programs/test_hash_algs.c +5 -1
index 16cc408..ede9f05 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Test the hash algorithm-related libfsverity APIs.
  *
  * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "utils.h"
programs/test_sign_digest.c +5 -1
index b0bb328..412c6cb 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Test libfsverity_sign_digest().
  *
  * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "utils.h"
programs/utils.c +5 -1
index 4792e72..0aca98d 100644
@@ -1,8 +1,12 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: MIT
 /*
  * Utility functions for the 'fsverity' program
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 
 #include "utils.h"
programs/utils.h +5 -1
index 07773d3..cd5641c 100644
@@ -1,8 +1,12 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: MIT */
 /*
  * Utility functions for programs
  *
  * Copyright 2018 Google LLC
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
  */
 #ifndef PROGRAMS_UTILS_H
 #define PROGRAMS_UTILS_H
scripts/do-release.sh +5 -1
index 68a8ac2..9662919 100755
@@ -1,6 +1,10 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: MIT
 # Copyright 2020 Google LLC
+#
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
 
 set -e -u -o pipefail
 cd "$(dirname "$0")/.."
scripts/run-sparse.sh +5 -1
index a644bf2..5b6a0ba 100755
@@ -1,6 +1,10 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: MIT
 # Copyright 2020 Google LLC
+#
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
 
 set -e -u -o pipefail
 
scripts/run-tests.sh +14 -3
index cecd951..092159a 100755
@@ -1,7 +1,12 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-License-Identifier: MIT
 # Copyright 2020 Google LLC
 #
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+#
+#
 # Test script for fsverity-utils.  Runs 'make check' in lots of configurations,
 # runs static analysis, and does a few other tests.
 #
@@ -92,13 +97,19 @@ log "Check that all files have license and copyright info"
 list="$TMPDIR/filelist"
 filter_license_info() {
 	# files to exclude from license and copyright info checks
-	grep -E -v '(\.gitignore|COPYING|NEWS|README|testdata|fsverity_uapi\.h)'
+	grep -E -v '(\.gitignore|LICENSE|NEWS|README|testdata|fsverity_uapi\.h)'
 }
-git grep -L 'SPDX-License-Identifier: GPL-2\.0-or-later' \
+git grep -L 'SPDX-License-Identifier: MIT' \
 	| filter_license_info > "$list" || true
 if [ -s "$list" ]; then
 	fail "The following files are missing an appropriate SPDX license identifier: $(<"$list")"
 fi
+# For now some people still prefer a free-form license statement, not just SPDX.
+git grep -L 'Use of this source code is governed by an MIT-style' \
+	| filter_license_info > "$list" || true
+if [ -s "$list" ]; then
+	fail "The following files are missing an appropriate license statement: $(<"$list")"
+fi
 git grep -L '\<Copyright\>' | filter_license_info > "$list" || true
 if [ -s "$list" ]; then
 	fail "The following files are missing a copyright statement: $(<"$list")"
Signature · 1 line
2.28.0
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Eric Biggers

From: Eric Biggers <[email protected]>

This allows libfsverity to be used by software with other common licenses, e.g. LGPL, MIT, BSD, and Apache 2.0. It also avoids the incompatibility that some people perceive between OpenSSL and the GPL.

See discussion at
https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u

Acked-by on v1 1/1
#2 lore raw
In reply to Eric Biggers
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

This allows libfsverity to be used by software with other common licenses, e.g. LGPL, MIT, BSD, and Apache 2.0. It also avoids the incompatibility that some people perceive between OpenSSL and the GPL.

See discussion at
https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u

---

author maintainer
#3 lore raw
Quoted 7 lines · Jes Sorensen
Quoted 6 lines · Eric Biggers

From: Eric Biggers <[email protected]>

This allows libfsverity to be used by software with other common licenses, e.g. LGPL, MIT, BSD, and Apache 2.0. It also avoids the incompatibility that some people perceive between OpenSSL and the GPL.

Quoted 9 lines
Quoted 5 lines

See discussion at
https://lkml.kernel.org/linux-fscrypt/[email protected]/T/#u

---

Applied and pushed. Thanks Chris and Jes!

- Eric