diff mbox series

[3/3] Apply the cryptsetup-OpenSSL-exception

Message ID 20260818094508.179584-4-bage@debian.org
State New
Headers show
Series Apply cryptsetup-OpenSSL-exception | expand

Commit Message

Bastian Germann Aug. 18, 2026, 9:45 a.m. UTC 
The SPDX specification 2.0 allows combining licenses and license expressions
using the WITH operator so they do not need to add every combination of
licenses with their exceptions.

Apply the exception the the GPL files copyrighted by Bastian Germann.

Signed-off-by: Bastian Germann <bage@debian.org>
---
 crypto/swupdate_pkcs11.h                   | 6 ++----
 crypto/swupdate_pkcs7_verify_mbedtls.c     | 2 +-
 crypto/swupdate_pkcs7_verify_wolfssl.c     | 2 +-
 lws/Kconfig                                | 2 +-
 lws/Makefile                               | 2 +-
 lws/lws_interface.c                        | 2 +-
 scripts/acceptance-tests/test_webserver.sh | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/crypto/swupdate_pkcs11.h b/crypto/swupdate_pkcs11.h
index 5658dc88..5f78cfd1 100644
--- a/crypto/swupdate_pkcs11.h
+++ b/crypto/swupdate_pkcs11.h
@@ -1,8 +1,6 @@ 
 /*
- * (C) Copyright 2025
- * Bastian Germann
- *
- * SPDX-License-Identifier:     GPL-2.0-only
+ * SPDX-FileCopyrightText: 2025 Bastian Germann
+ * SPDX-License-Identifier: GPL-2.0-only WITH cryptsetup-OpenSSL-exception
  */
 
 #pragma once
diff --git a/crypto/swupdate_pkcs7_verify_mbedtls.c b/crypto/swupdate_pkcs7_verify_mbedtls.c
index 450d995e..b082bb6e 100644
--- a/crypto/swupdate_pkcs7_verify_mbedtls.c
+++ b/crypto/swupdate_pkcs7_verify_mbedtls.c
@@ -1,6 +1,6 @@ 
 // SPDX-FileCopyrightText: 2026 Bastian Germann
 //
-// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-License-Identifier: GPL-2.0-only WITH cryptsetup-OpenSSL-exception
 
 #include <mbedtls/version.h>
 #if defined(CONFIG_SIGALG_CMS) && MBEDTLS_VERSION_NUMBER >= 0x03040000
diff --git a/crypto/swupdate_pkcs7_verify_wolfssl.c b/crypto/swupdate_pkcs7_verify_wolfssl.c
index 8473359a..7d428fc1 100644
--- a/crypto/swupdate_pkcs7_verify_wolfssl.c
+++ b/crypto/swupdate_pkcs7_verify_wolfssl.c
@@ -4,7 +4,7 @@ 
  * (C) Copyright 2023
  * Bastian Germann
  *
- * SPDX-License-Identifier:     GPL-2.0-only
+ * SPDX-License-Identifier:     GPL-2.0-only WITH cryptsetup-OpenSSL-exception
  *
  * Code mostly taken from openssl examples
  */
diff --git a/lws/Kconfig b/lws/Kconfig
index 6405f8c4..00f46e65 100644
--- a/lws/Kconfig
+++ b/lws/Kconfig
@@ -1,6 +1,6 @@ 
 # SPDX-FileCopyrightText: 2026 Bastian Germann
 #
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-2.0-only WITH cryptsetup-OpenSSL-exception
 
 config LWS
 	bool "libwebsockets"
diff --git a/lws/Makefile b/lws/Makefile
index 1789ffdb..7b615c5f 100644
--- a/lws/Makefile
+++ b/lws/Makefile
@@ -1,5 +1,5 @@ 
 # SPDX-FileCopyrightText: 2026 Bastian Germann
 #
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-2.0-only WITH cryptsetup-OpenSSL-exception
 
 lib-$(CONFIG_LWS) += lws_interface.o
diff --git a/lws/lws_interface.c b/lws/lws_interface.c
index c01cf457..14595612 100644
--- a/lws/lws_interface.c
+++ b/lws/lws_interface.c
@@ -1,6 +1,6 @@ 
 /* SPDX-FileCopyrightText: 2026 Bastian Germann
  *
- * SPDX-License-Identifier: GPL-2.0-only
+ * SPDX-License-Identifier: GPL-2.0-only WITH cryptsetup-OpenSSL-exception
  */
 
 /*
diff --git a/scripts/acceptance-tests/test_webserver.sh b/scripts/acceptance-tests/test_webserver.sh
index b75925e6..9e90049a 100755
--- a/scripts/acceptance-tests/test_webserver.sh
+++ b/scripts/acceptance-tests/test_webserver.sh
@@ -1,6 +1,6 @@ 
 #!/bin/sh
 # SPDX-FileCopyrightText: 2026 Bastian Germann
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: GPL-2.0-only WITH cryptsetup-OpenSSL-exception
 #
 # Integration tests for the SWUpdate webserver.
 #