Merge branch 'license/spdx'

128 files changed, 256 insertions, 0 deletions

diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 5e0bae539..5cf1297c7 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/benchmark.c b/src/util/benchmark.c
index b5fc2752c..bb1c3c79a 100644
--- a/src/util/benchmark.c
+++ b/src/util/benchmark.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/benchmark.h b/src/util/benchmark.h
index 145d7cee7..36f57febe 100644
--- a/src/util/benchmark.h
+++ b/src/util/benchmark.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/bio.c b/src/util/bio.c
index a31e5448f..def9b02e1 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/bio.c
diff --git a/src/util/client.c b/src/util/client.c
index 1f569255a..9bdb09e30 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 53e1a6707..20333ce56 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/common_endian.c b/src/util/common_endian.c
index 502e1e3a3..d7daa2d79 100644
--- a/src/util/common_endian.c
+++ b/src/util/common_endian.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index f9f767daa..ffc9a527b 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/configuration.c b/src/util/configuration.c
index d61b9c27e..a38438ba8 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 45711e0fd..095e69474 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index 5f2fdd3ad..a41c0cf8a 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_bloomfilter.c
diff --git a/src/util/container_heap.c b/src/util/container_heap.c
index 5a0ae0002..d5dca20ef 100644
--- a/src/util/container_heap.c
+++ b/src/util/container_heap.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index 3859d8e64..4989b876a 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c
index e344c2aec..cf5c2a334 100644
--- a/src/util/container_multihashmap.c
+++ b/src/util/container_multihashmap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multihashmap.c
diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c
index 72940489e..4b19c7c10 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multihashmap32.c
diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c
index 67d6e1684..8fa23df72 100644
--- a/src/util/container_multipeermap.c
+++ b/src/util/container_multipeermap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multipeermap.c
diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c
index 050fd21f9..a48581b6a 100644
--- a/src/util/container_multishortmap.c
+++ b/src/util/container_multishortmap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/container_multishortmap.c
diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c
index 581e63764..1d69a01ae 100644
--- a/src/util/crypto_abe.c
+++ b/src/util/crypto_abe.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index b8fd8059d..3d8e23e24 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
      For the actual CRC-32 code:
      Copyright abandoned; this code is in the public domain.
      Provided to GNUnet by peter@horizon.com
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 9902f276d..ac7662a10 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c
index 9d3674319..07777e377 100644
--- a/src/util/crypto_ecc_dlog.c
+++ b/src/util/crypto_ecc_dlog.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c
index 507cbba11..1031b302e 100644
--- a/src/util/crypto_ecc_setup.c
+++ b/src/util/crypto_ecc_setup.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index cd36fbbd7..925d6b94d 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/crypto_hash.c
diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c
index 4d9824d22..83afe5e91 100644
--- a/src/util/crypto_hash_file.c
+++ b/src/util/crypto_hash_file.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/crypto_hash_file.c
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 0fc6996eb..ac68ed7f1 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 0cb49d62f..14c672383 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c
index 416240ea4..622ce81fa 100644
--- a/src/util/crypto_paillier.c
+++ b/src/util/crypto_paillier.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index df6d3fb9b..54bea58e1 100644
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index c981ea63b..8cb0fe6c6 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index f7d7b4a7a..18784d127 100644
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/disk.c b/src/util/disk.c
index d723303d8..de37cba0a 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/disk.c
diff --git a/src/util/disk.h b/src/util/disk.h
index 629971d81..aee028ade 100644
--- a/src/util/disk.h
+++ b/src/util/disk.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index 2d2354222..2baa76ef2 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -14,6 +14,8 @@
 
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/dnsstub.c b/src/util/dnsstub.c
index 5b84e6e63..a16a9a7dd 100644
--- a/src/util/dnsstub.c
+++ b/src/util/dnsstub.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file dns/dnsstub.c
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index 661521c45..77032e501 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 3c7eaa6dc..361fa55d6 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index 438999402..27ef59c9f 100644
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-helper-w32-console.c b/src/util/gnunet-helper-w32-console.c
index 3540cae8a..fdebd9a49 100644
--- a/src/util/gnunet-helper-w32-console.c
+++ b/src/util/gnunet-helper-w32-console.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-helper-w32-console.h b/src/util/gnunet-helper-w32-console.h
index d70b0e32a..eaa9019a5 100644
--- a/src/util/gnunet-helper-w32-console.h
+++ b/src/util/gnunet-helper-w32-console.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c
index e841afca9..e5d58b4b6 100644
--- a/src/util/gnunet-resolver.c
+++ b/src/util/gnunet-resolver.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index fb66a757d..5e15eb16a 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/gnunet-scrypt.c
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 5f8957d8c..d85885d64 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-timeout-w32.c b/src/util/gnunet-timeout-w32.c
index 78b268fe2..6f92b172f 100644
--- a/src/util/gnunet-timeout-w32.c
+++ b/src/util/gnunet-timeout-w32.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-timeout.c b/src/util/gnunet-timeout.c
index 8dfb6ad17..18721ba03 100644
--- a/src/util/gnunet-timeout.c
+++ b/src/util/gnunet-timeout.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 33cd3543d..58f9e331c 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/helper.c b/src/util/helper.c
index 5cdfb904a..7eb2ce6d9 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/load.c b/src/util/load.c
index 41ee7a91a..f5ea875bb 100644
--- a/src/util/load.c
+++ b/src/util/load.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/mq.c b/src/util/mq.c
index 8bf1f9752..4dfcb72be 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/mst.c b/src/util/mst.c
index a5c6f3c3e..bc52f2356 100644
--- a/src/util/mst.c
+++ b/src/util/mst.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/nc.c b/src/util/nc.c
index 42a0114a7..7a3c5877e 100644
--- a/src/util/nc.c
+++ b/src/util/nc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/network.c b/src/util/network.c
index fe9827083..3e39374e8 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/op.c b/src/util/op.c
index 19f6ce4f0..8fca7553e 100644
--- a/src/util/op.c
+++ b/src/util/op.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 2977a833b..f2d24f85e 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 3e9ea47b4..dba61f1e4 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/os_network.c
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index a758f24f1..03d4bde9e 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/peer.c b/src/util/peer.c
index f9e1b4cbe..00a259a3b 100644
--- a/src/util/peer.c
+++ b/src/util/peer.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c
index acfdba541..b2b9f5692 100644
--- a/src/util/perf_crypto_asymmetric.c
+++ b/src/util/perf_crypto_asymmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c
index 4be928d42..59fa08d3a 100644
--- a/src/util/perf_crypto_ecc_dlog.c
+++ b/src/util/perf_crypto_ecc_dlog.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/perf_crypto_ecc_dlog.c
diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c
index f1c69e96a..c74f425ce 100644
--- a/src/util/perf_crypto_hash.c
+++ b/src/util/perf_crypto_hash.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c
index b1430d713..a62b72c96 100644
--- a/src/util/perf_crypto_paillier.c
+++ b/src/util/perf_crypto_paillier.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c
index 4ad348d5b..685389206 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c
index 2382010e1..0bef04b7a 100644
--- a/src/util/perf_crypto_symmetric.c
+++ b/src/util/perf_crypto_symmetric.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c
index 01694d766..4447934af 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/plugin.c b/src/util/plugin.c
index 4a6e8577e..4b922340d 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/program.c b/src/util/program.c
index 2fa8676a2..f22dcddbf 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/regex.c b/src/util/regex.c
index 7565a9eac..70bf5c485 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file src/tun/regex.c
diff --git a/src/util/resolver.h b/src/util/resolver.h
index 54a1cf5fd..0991ad39f 100644
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 871eeb4bf..78ce222e6 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 5d3836639..dd0d5d5cf 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -14,6 +14,8 @@
      
       You should have received a copy of the GNU Affero General Public License
       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file util/scheduler.c
diff --git a/src/util/service.c b/src/util/service.c
index 098030ddf..b481a4786 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/signal.c b/src/util/signal.c
index ecb792106..3e23f4a59 100644
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/socks.c b/src/util/socks.c
index 1459fd2f0..7eca04878 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/speedup.c b/src/util/speedup.c
index d32364480..c5c1f6a53 100644
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/speedup.h b/src/util/speedup.h
index a9ea1cbae..5b665133e 100644
--- a/src/util/speedup.h
+++ b/src/util/speedup.h
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/strings.c b/src/util/strings.c
index 3f85384e1..535c998cd 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/strings.c
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index acdd0bc06..719f622ba 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_client.c b/src/util/test_client.c
index a425f7ec4..365b8663f 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_client.c
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c
index dd2bb23c3..476934b3f 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c
index f7bf00b40..6e08b4f07 100644
--- a/src/util/test_common_endian.c
+++ b/src/util/test_common_endian.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_common_endian.c
diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c
index 5832e75f4..396bf3966 100644
--- a/src/util/test_common_logging.c
+++ b/src/util/test_common_logging.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c
index afa78aad0..b8f2bef91 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 863cb2a55..7c72acf7d 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 067c15bf2..96f13eefe 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_configuration.c
diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c
index c144f48a1..42849af97 100644
--- a/src/util/test_container_bloomfilter.c
+++ b/src/util/test_container_bloomfilter.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_container_bloomfilter.c
diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c
index 47d4c3d61..f1c0e9446 100644
--- a/src/util/test_container_dll.c
+++ b/src/util/test_container_dll.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index 4be235573..f95032ca0 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index 5a658cc75..416ea7db9 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c
index 188eb2968..b83e90646 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_container_multihashmap32.c b/src/util/test_container_multihashmap32.c
index 15a74d4ac..e0e813716 100644
--- a/src/util/test_container_multihashmap32.c
+++ b/src/util/test_container_multihashmap32.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c
index 3f7b44da5..a8ec8b8f2 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_crypto_crc.c b/src/util/test_crypto_crc.c
index 3695603cd..838da5dbc 100644
--- a/src/util/test_crypto_crc.c
+++ b/src/util/test_crypto_crc.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
      For the actual CRC code:
      Copyright abandoned; this code is in the public domain.
      Provided to GNUnet by peter@horizon.com
diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c
index eabe3ed08..0b0b8d57c 100644
--- a/src/util/test_crypto_ecc_dlog.c
+++ b/src/util/test_crypto_ecc_dlog.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecc_dlog.c
diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c
index b7b1634e4..721f831d0 100644
--- a/src/util/test_crypto_ecdh_eddsa.c
+++ b/src/util/test_crypto_ecdh_eddsa.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecdh_eddsa.c
diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c
index 6f887e9f3..c4392ca5a 100644
--- a/src/util/test_crypto_ecdhe.c
+++ b/src/util/test_crypto_ecdhe.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecdhe.c
diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c
index b3df27513..8fa5eb486 100644
--- a/src/util/test_crypto_ecdsa.c
+++ b/src/util/test_crypto_ecdsa.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_ecdsa.c
diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c
index 8539be277..e738f7e6c 100644
--- a/src/util/test_crypto_eddsa.c
+++ b/src/util/test_crypto_eddsa.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_eddsa.c
diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c
index 609be8a72..52e24718d 100644
--- a/src/util/test_crypto_hash.c
+++ b/src/util/test_crypto_hash.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_crypto_hash_context.c b/src/util/test_crypto_hash_context.c
index 26487fd39..847fe56ba 100644
--- a/src/util/test_crypto_hash_context.c
+++ b/src/util/test_crypto_hash_context.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_crypto_hash_context.c
diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c
index d600a2806..d19696372 100644
--- a/src/util/test_crypto_paillier.c
+++ b/src/util/test_crypto_paillier.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @file util/test_crypto_paillier.c
diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c
index f5e0a2731..dec58086a 100644
--- a/src/util/test_crypto_random.c
+++ b/src/util/test_crypto_random.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 
 /**
diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index 320dfce54..36c47005e 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -14,6 +14,8 @@
  
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index d6d177ed0..d731c45b7 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @author Christian Grothoff
diff --git a/src/util/test_disk.c b/src/util/test_disk.c
index 352e3ee3e..267d4d4f9 100644
--- a/src/util/test_disk.c
+++ b/src/util/test_disk.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c
index e5b854658..4294117a6 100644
--- a/src/util/test_getopt.c
+++ b/src/util/test_getopt.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_getopt.c
diff --git a/src/util/test_hexcoder.c b/src/util/test_hexcoder.c
index 441d7e200..f73989a0e 100644
--- a/src/util/test_hexcoder.c
+++ b/src/util/test_hexcoder.c
@@ -15,6 +15,8 @@
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+     SPDX-License-Identifier: AGPL3.0-or-later
+
 */
 /**
  * @author Christian Grothoff
diff --git a/src/util/test_mq.c b/src/util/test_mq.c
index c02ee677e..9a396bcae 100644
--- a/src/util/test_mq.c
+++ b/src/util/test_mq.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c
index 1809a8eb6..b6e981bc3 100644
--- a/src/util/test_os_network.c
+++ b/src/util/test_os_network.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_os_network.c
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 1d87f2ab3..826e5744c 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_os_start_process.c
diff --git a/src/util/test_peer.c b/src/util/test_peer.c
index ddb242738..9fbedb15c 100644
--- a/src/util/test_peer.c
+++ b/src/util/test_peer.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_peer.c
diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index a736a077a..04dcdf213 100644
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_plugin.c
diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c
index 683b45d3c..deb36b0a0 100644
--- a/src/util/test_plugin_plug.c
+++ b/src/util/test_plugin_plug.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_plugin_plug.c
diff --git a/src/util/test_program.c b/src/util/test_program.c
index 001f3aea1..a9b3b064a 100644
--- a/src/util/test_program.c
+++ b/src/util/test_program.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_program.c
diff --git a/src/util/test_regex.c b/src/util/test_regex.c
index 4eb7cf87d..b47314084 100644
--- a/src/util/test_regex.c
+++ b/src/util/test_regex.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file tun/test_regex.c
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 5a8f95093..686301694 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -14,6 +14,8 @@
 
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file resolver/test_resolver_api.c
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 904461465..c38af8a0a 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_scheduler.c
diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c
index f8c4ef8da..6c25531f2 100644
--- a/src/util/test_scheduler_delay.c
+++ b/src/util/test_scheduler_delay.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_scheduler_delay.c
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 6858f956e..72bd1f371 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_service.c
diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index 9df7b66bc..89a350feb 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_socks.c
diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c
index 8a385ae47..a46d83dc3 100644
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_speedup.c
diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 3750986e6..652c3be23 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_strings.c
diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c
index 1c58d91ec..f7d20441f 100644
--- a/src/util/test_strings_to_data.c
+++ b/src/util/test_strings_to_data.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_strings_to_data.c
diff --git a/src/util/test_time.c b/src/util/test_time.c
index 80c4e5337..6f4a6332b 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_time.c
diff --git a/src/util/test_tun.c b/src/util/test_tun.c
index 429678fd5..391791c4b 100644
--- a/src/util/test_tun.c
+++ b/src/util/test_tun.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/time.c b/src/util/time.c
index 382265aa1..799c6cc63 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/tun.c b/src/util/tun.c
index 25e729e58..97fbaa83b 100644
--- a/src/util/tun.c
+++ b/src/util/tun.c
@@ -14,6 +14,8 @@
 
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/w32cat.c b/src/util/w32cat.c
index f2a0feac5..8a48638aa 100644
--- a/src/util/w32cat.c
+++ b/src/util/w32cat.c
@@ -16,6 +16,8 @@
      along with cat; see the file COPYING.  If not, write to the
      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
      Boston, MA 02110-1301, USA.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 #include <stdio.h>
diff --git a/src/util/win.c b/src/util/win.c
index 511e5d515..ad6275cc4 100644
--- a/src/util/win.c
+++ b/src/util/win.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
diff --git a/src/util/winproc.c b/src/util/winproc.c
index 887df2412..2781b901f 100644
--- a/src/util/winproc.c
+++ b/src/util/winproc.c
@@ -14,6 +14,8 @@
     
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**