diff options
Diffstat (limited to 'wsutil')
108 files changed, 108 insertions, 108 deletions
diff --git a/wsutil/adler32.c b/wsutil/adler32.c index eb68c0280e..21e6ee3d41 100644 --- a/wsutil/adler32.c +++ b/wsutil/adler32.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <string.h> diff --git a/wsutil/adler32.h b/wsutil/adler32.h index 70cb6cf512..e5b72b8110 100644 --- a/wsutil/adler32.h +++ b/wsutil/adler32.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ADLER32_H diff --git a/wsutil/base32.c b/wsutil/base32.c index 2c320a616d..525dba93ef 100644 --- a/wsutil/base32.c +++ b/wsutil/base32.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/base32.h b/wsutil/base32.h index b3a5d3d54f..75251e66b9 100644 --- a/wsutil/base32.h +++ b/wsutil/base32.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __BASE32_H__ #define __BASE32_H__ diff --git a/wsutil/base64.c b/wsutil/base64.c index bbf3e40cc5..951d20b5b0 100644 --- a/wsutil/base64.c +++ b/wsutil/base64.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/base64.h b/wsutil/base64.h index a58951ad0d..07b5d118d3 100644 --- a/wsutil/base64.h +++ b/wsutil/base64.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __BASE64_H__ #define __BASE64_H__ diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h index d2d7c22b04..2e532e93b0 100644 --- a/wsutil/bits_count_ones.h +++ b/wsutil/bits_count_ones.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_BITS_COUNT_ONES_H__ diff --git a/wsutil/bits_ctz.h b/wsutil/bits_ctz.h index 47d90c2dec..54071b08fb 100644 --- a/wsutil/bits_ctz.h +++ b/wsutil/bits_ctz.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_BITS_CTZ_H__ diff --git a/wsutil/bitswap.c b/wsutil/bitswap.c index 1d868e3071..2eb00768ba 100644 --- a/wsutil/bitswap.c +++ b/wsutil/bitswap.c @@ -6,7 +6,7 @@ * Copyright 1998 Gerald Combs * * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/bitswap.h b/wsutil/bitswap.h index aa76c66d6f..8f4a05d9a0 100644 --- a/wsutil/bitswap.h +++ b/wsutil/bitswap.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __BITSWAP_H__ diff --git a/wsutil/buffer.c b/wsutil/buffer.c index 40ef5a348d..86b6ef1e78 100644 --- a/wsutil/buffer.c +++ b/wsutil/buffer.c @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/buffer.h b/wsutil/buffer.h index 13fe585aff..1dfccd9fe0 100644 --- a/wsutil/buffer.h +++ b/wsutil/buffer.h @@ -3,7 +3,7 @@ * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __W_BUFFER_H__ diff --git a/wsutil/cfutils.c b/wsutil/cfutils.c index 95d21b4f34..9707fe09a1 100644 --- a/wsutil/cfutils.c +++ b/wsutil/cfutils.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/cfutils.h b/wsutil/cfutils.h index 2723227c85..c6ed5a2486 100644 --- a/wsutil/cfutils.h +++ b/wsutil/cfutils.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_CFUTILS_H__ diff --git a/wsutil/clopts_common.c b/wsutil/clopts_common.c index 657dd52626..ab21be9980 100644 --- a/wsutil/clopts_common.c +++ b/wsutil/clopts_common.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/clopts_common.h b/wsutil/clopts_common.h index c3d62593e0..57e70c8955 100644 --- a/wsutil/clopts_common.h +++ b/wsutil/clopts_common.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_CLOPTS_COMMON_H__ diff --git a/wsutil/cmdarg_err.c b/wsutil/cmdarg_err.c index 360c4a34c7..e7368dd5db 100644 --- a/wsutil/cmdarg_err.c +++ b/wsutil/cmdarg_err.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/cmdarg_err.h b/wsutil/cmdarg_err.h index 5bc5d01707..4e8816ad07 100644 --- a/wsutil/cmdarg_err.h +++ b/wsutil/cmdarg_err.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_CMDARG_ERR_H__ diff --git a/wsutil/color.h b/wsutil/color.h index 4c2be7ead1..355d08fdf4 100644 --- a/wsutil/color.h +++ b/wsutil/color.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __COLOR_H__ #define __COLOR_H__ diff --git a/wsutil/copyright_info.c b/wsutil/copyright_info.c index b7f4945400..6b80f9b2f2 100644 --- a/wsutil/copyright_info.c +++ b/wsutil/copyright_info.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/copyright_info.h b/wsutil/copyright_info.h index e055ee7e2f..83abcd6273 100644 --- a/wsutil/copyright_info.h +++ b/wsutil/copyright_info.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_COPYRIGHT_INFO_H__ diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c index 8d7371b550..ce62a0e9d3 100644 --- a/wsutil/cpu_info.c +++ b/wsutil/cpu_info.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/cpu_info.h b/wsutil/cpu_info.h index 16a7e9bd7f..3579576ba7 100644 --- a/wsutil/cpu_info.h +++ b/wsutil/cpu_info.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_CPU_INFO_H__ diff --git a/wsutil/crash_info.c b/wsutil/crash_info.c index ab192393f5..7f13513267 100644 --- a/wsutil/crash_info.c +++ b/wsutil/crash_info.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/crash_info.h b/wsutil/crash_info.h index a8c6ef414c..8cb9cd3a21 100644 --- a/wsutil/crash_info.h +++ b/wsutil/crash_info.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRASH_INFO_H__ diff --git a/wsutil/crc10.c b/wsutil/crc10.c index 81117f3f2d..007c46eb8f 100644 --- a/wsutil/crc10.c +++ b/wsutil/crc10.c @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/crc10.h b/wsutil/crc10.h index 42308ec3ab..2834cd3bbf 100644 --- a/wsutil/crc10.h +++ b/wsutil/crc10.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRC10_H__ diff --git a/wsutil/crc11.c b/wsutil/crc11.c index 7d6f84dafe..4144750c77 100644 --- a/wsutil/crc11.c +++ b/wsutil/crc11.c @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/wsutil/crc11.h b/wsutil/crc11.h index 92407f8bff..c9ac52ba18 100644 --- a/wsutil/crc11.h +++ b/wsutil/crc11.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRC11_____H__ diff --git a/wsutil/crc16-plain.c b/wsutil/crc16-plain.c index 49a621114b..8aa22850f5 100644 --- a/wsutil/crc16-plain.c +++ b/wsutil/crc16-plain.c @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /** diff --git a/wsutil/crc16-plain.h b/wsutil/crc16-plain.h index 3828ea8553..f2efe1a0d3 100644 --- a/wsutil/crc16-plain.h +++ b/wsutil/crc16-plain.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /** diff --git a/wsutil/crc16.c b/wsutil/crc16.c index 10d4c01786..05ca10b3cd 100644 --- a/wsutil/crc16.c +++ b/wsutil/crc16.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * References: * "A Painless Guide to CRC Error Detection Algorithms", Ross Williams diff --git a/wsutil/crc16.h b/wsutil/crc16.h index 6cc116a850..922599bf7c 100644 --- a/wsutil/crc16.h +++ b/wsutil/crc16.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRC16_H__ diff --git a/wsutil/crc32.c b/wsutil/crc32.c index a36257a7f1..62b6a54e6d 100644 --- a/wsutil/crc32.c +++ b/wsutil/crc32.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Credits: * diff --git a/wsutil/crc32.h b/wsutil/crc32.h index 48ced584c6..511d11d8d1 100644 --- a/wsutil/crc32.h +++ b/wsutil/crc32.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRC32_H__ diff --git a/wsutil/crc6.c b/wsutil/crc6.c index f5e7fa50d5..ef1372412e 100644 --- a/wsutil/crc6.c +++ b/wsutil/crc6.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/crc6.h b/wsutil/crc6.h index 6d9a397095..a91f09fec1 100644 --- a/wsutil/crc6.h +++ b/wsutil/crc6.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRC6_H__ diff --git a/wsutil/crc7.c b/wsutil/crc7.c index 80a7c038ad..d88091dba8 100644 --- a/wsutil/crc7.c +++ b/wsutil/crc7.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * * Generated on Wed Jul 11 17:24:30 2012, diff --git a/wsutil/crc7.h b/wsutil/crc7.h index a26eb503c2..adb35aac0f 100644 --- a/wsutil/crc7.h +++ b/wsutil/crc7.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Generated on Wed Jul 11 17:24:57 2012, * by pycrc v0.7.10, http://www.tty1.net/pycrc/ diff --git a/wsutil/crc8.c b/wsutil/crc8.c index f22f51a808..a2714330cc 100644 --- a/wsutil/crc8.c +++ b/wsutil/crc8.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/wsutil/crc8.h b/wsutil/crc8.h index 940e918ffc..b8ca2f6fb1 100644 --- a/wsutil/crc8.h +++ b/wsutil/crc8.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CRC8_H__ diff --git a/wsutil/eax.c b/wsutil/eax.c index b21bf23423..10f2fa2420 100644 --- a/wsutil/eax.c +++ b/wsutil/eax.c @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" #include <stdlib.h> diff --git a/wsutil/eax.h b/wsutil/eax.h index 1b85ba7bdd..bc7118c290 100644 --- a/wsutil/eax.h +++ b/wsutil/eax.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _EAX_H diff --git a/wsutil/file_util.c b/wsutil/file_util.c index eda43617fd..1149e8e8cb 100644 --- a/wsutil/file_util.c +++ b/wsutil/file_util.c @@ -4,7 +4,7 @@ * utility library) * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/wsutil/file_util.h b/wsutil/file_util.h index ba74dd111e..fe2f7ba118 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __FILE_UTIL_H__ diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 7a2832af36..4d4abc6977 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h index 4e67683f3b..da45aeb0bf 100644 --- a/wsutil/filesystem.h +++ b/wsutil/filesystem.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef FILESYSTEM_H diff --git a/wsutil/frequency-utils.c b/wsutil/frequency-utils.c index f6f2ab599b..3c6d157423 100644 --- a/wsutil/frequency-utils.c +++ b/wsutil/frequency-utils.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/frequency-utils.h b/wsutil/frequency-utils.h index b0a659d45f..e7367ee3cf 100644 --- a/wsutil/frequency-utils.h +++ b/wsutil/frequency-utils.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __FREQUENCY_UTILS_H__ diff --git a/wsutil/g711.h b/wsutil/g711.h index 8feb017cf8..81e66bede1 100644 --- a/wsutil/g711.h +++ b/wsutil/g711.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __G711_H__ diff --git a/wsutil/glib-compat.c b/wsutil/glib-compat.c index e741581c93..b1181d3809 100644 --- a/wsutil/glib-compat.c +++ b/wsutil/glib-compat.c @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ +* SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/glib-compat.h b/wsutil/glib-compat.h index 8393e91232..cf00cadaf6 100644 --- a/wsutil/glib-compat.h +++ b/wsutil/glib-compat.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * -* SPDX-License-Identifier: GPL-2.0+ +* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef GLIB_COMPAT_H #define GLIB_COMPAT_H diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c index 417c1c6040..8f047721a7 100644 --- a/wsutil/inet_addr.c +++ b/wsutil/inet_addr.c @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/inet_addr.h b/wsutil/inet_addr.h index 4de59fab17..267952f47b 100644 --- a/wsutil/inet_addr.h +++ b/wsutil/inet_addr.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WS_INET_ADDR_H__ diff --git a/wsutil/inet_ipv4.h b/wsutil/inet_ipv4.h index eab3441bc1..9be3ca6a37 100644 --- a/wsutil/inet_ipv4.h +++ b/wsutil/inet_ipv4.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __INET_IPV4_H__ diff --git a/wsutil/inet_ipv6.h b/wsutil/inet_ipv6.h index 7209e4e15c..cf4453e53f 100644 --- a/wsutil/inet_ipv6.h +++ b/wsutil/inet_ipv6.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __INET_IPV6_H__ diff --git a/wsutil/interface.c b/wsutil/interface.c index c753cae207..0d9b282d00 100644 --- a/wsutil/interface.c +++ b/wsutil/interface.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/interface.h b/wsutil/interface.h index 0962f039cf..ee9ab1c0a0 100644 --- a/wsutil/interface.h +++ b/wsutil/interface.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _INTERFACE_H diff --git a/wsutil/mpeg-audio.c b/wsutil/mpeg-audio.c index 843727dde2..b5168a66fc 100644 --- a/wsutil/mpeg-audio.c +++ b/wsutil/mpeg-audio.c @@ -5,7 +5,7 @@ * Copyright 2007 Shaun Jackman * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "mpeg-audio.h" diff --git a/wsutil/mpeg-audio.h b/wsutil/mpeg-audio.h index f366815b71..ce102117e4 100644 --- a/wsutil/mpeg-audio.h +++ b/wsutil/mpeg-audio.h @@ -5,7 +5,7 @@ * Copyright 2007 Shaun Jackman * * Wiretap Library - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef MPA_H diff --git a/wsutil/nstime.c b/wsutil/nstime.c index b2169c0654..456530a5e3 100644 --- a/wsutil/nstime.c +++ b/wsutil/nstime.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <glib.h> diff --git a/wsutil/nstime.h b/wsutil/nstime.h index f1b9ff8f69..0d976200b8 100644 --- a/wsutil/nstime.h +++ b/wsutil/nstime.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NSTIME_H__ diff --git a/wsutil/os_version_info.c b/wsutil/os_version_info.c index e29583b88c..2bfb264d62 100644 --- a/wsutil/os_version_info.c +++ b/wsutil/os_version_info.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/os_version_info.h b/wsutil/os_version_info.h index 5f9bb6391b..c9e14c337e 100644 --- a/wsutil/os_version_info.h +++ b/wsutil/os_version_info.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_OS_VERSION_INFO_H__ diff --git a/wsutil/pint.h b/wsutil/pint.h index 86109023e5..72c67e4a48 100644 --- a/wsutil/pint.h +++ b/wsutil/pint.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __PINT_H__ diff --git a/wsutil/plugins.c b/wsutil/plugins.c index 517065c2d7..0b9b526afb 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/plugins.h b/wsutil/plugins.h index 7987a42e16..49c221ef5e 100644 --- a/wsutil/plugins.h +++ b/wsutil/plugins.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __PLUGINS_H__ diff --git a/wsutil/popcount.c b/wsutil/popcount.c index 3418e61de0..7c0105e41e 100644 --- a/wsutil/popcount.c +++ b/wsutil/popcount.c @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/popcount.h b/wsutil/popcount.h index a7c779150c..561dd25338 100644 --- a/wsutil/popcount.h +++ b/wsutil/popcount.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __POPCOUNT_H__ diff --git a/wsutil/privileges.c b/wsutil/privileges.c index e1b4cd04b4..5ce48850c6 100644 --- a/wsutil/privileges.c +++ b/wsutil/privileges.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/privileges.h b/wsutil/privileges.h index 4ac72111a3..3a6169e434 100644 --- a/wsutil/privileges.h +++ b/wsutil/privileges.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __PRIVILEGES_H__ diff --git a/wsutil/processes.h b/wsutil/processes.h index 219af0d971..03c76e829d 100644 --- a/wsutil/processes.h +++ b/wsutil/processes.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _WSUTIL_PROCESSES_H_ diff --git a/wsutil/report_message.c b/wsutil/report_message.c index 3923817fba..98d48b9612 100644 --- a/wsutil/report_message.c +++ b/wsutil/report_message.c @@ -14,7 +14,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/report_message.h b/wsutil/report_message.h index fbf254a87d..d0d6b2fc28 100644 --- a/wsutil/report_message.h +++ b/wsutil/report_message.h @@ -14,7 +14,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __REPORT_MESSAGE_H__ diff --git a/wsutil/rsa.c b/wsutil/rsa.c index 504d8a5ef9..c71cdfd203 100644 --- a/wsutil/rsa.c +++ b/wsutil/rsa.c @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/rsa.h b/wsutil/rsa.h index 7e8169a650..07ddf8547a 100644 --- a/wsutil/rsa.h +++ b/wsutil/rsa.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __RSA_H__ diff --git a/wsutil/sign_ext.h b/wsutil/sign_ext.h index 3042b281c7..21104c5061 100644 --- a/wsutil/sign_ext.h +++ b/wsutil/sign_ext.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSUTIL_SIGN_EXT_H__ diff --git a/wsutil/socket.h b/wsutil/socket.h index 5234a72749..5e79ac54f9 100644 --- a/wsutil/socket.h +++ b/wsutil/socket.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __SOCKET_H__ #define __SOCKET_H__ diff --git a/wsutil/str_util.c b/wsutil/str_util.c index 8789594fd9..65c36d6b15 100644 --- a/wsutil/str_util.c +++ b/wsutil/str_util.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> diff --git a/wsutil/str_util.h b/wsutil/str_util.h index 9ca1158faa..e37b887024 100644 --- a/wsutil/str_util.h +++ b/wsutil/str_util.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __STR_UTIL_H__ diff --git a/wsutil/strptime.h b/wsutil/strptime.h index 4c2582c7e7..af5baabbc6 100644 --- a/wsutil/strptime.h +++ b/wsutil/strptime.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __STRPTIME_H__ diff --git a/wsutil/strtoi.c b/wsutil/strtoi.c index 7d07ad0465..ac97efe163 100644 --- a/wsutil/strtoi.c +++ b/wsutil/strtoi.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/strtoi.h b/wsutil/strtoi.h index b4ab13fbee..1e3fa6acd8 100644 --- a/wsutil/strtoi.h +++ b/wsutil/strtoi.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _WS_STRTOI_H diff --git a/wsutil/tempfile.c b/wsutil/tempfile.c index 09b63e503d..3d6c6edc7b 100644 --- a/wsutil/tempfile.c +++ b/wsutil/tempfile.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/tempfile.h b/wsutil/tempfile.h index a0dcb6d4d7..c528aedaad 100644 --- a/wsutil/tempfile.h +++ b/wsutil/tempfile.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __TEMPFILE_H__ diff --git a/wsutil/time_util.c b/wsutil/time_util.c index 03aa37dc76..36ab7ef8ab 100644 --- a/wsutil/time_util.c +++ b/wsutil/time_util.c @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/wsutil/time_util.h b/wsutil/time_util.h index 1775bb62a3..1cd430dedf 100644 --- a/wsutil/time_util.h +++ b/wsutil/time_util.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __TIME_UTIL_H__ diff --git a/wsutil/type_util.c b/wsutil/type_util.c index ace7775dbf..744cab028f 100644 --- a/wsutil/type_util.c +++ b/wsutil/type_util.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/type_util.h b/wsutil/type_util.h index 1144369db7..0944a494e1 100644 --- a/wsutil/type_util.h +++ b/wsutil/type_util.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __TYPE_UTIL_H__ diff --git a/wsutil/unicode-utils.c b/wsutil/unicode-utils.c index 42a410ad22..639bfcc06b 100644 --- a/wsutil/unicode-utils.c +++ b/wsutil/unicode-utils.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "unicode-utils.h" diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h index 995ad34c89..8bb06eeaa7 100644 --- a/wsutil/unicode-utils.h +++ b/wsutil/unicode-utils.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __UNICODEUTIL_H__ diff --git a/wsutil/utf8_entities.h b/wsutil/utf8_entities.h index d1e69cac24..de587f8856 100644 --- a/wsutil/utf8_entities.h +++ b/wsutil/utf8_entities.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/wsutil/win32-utils.c b/wsutil/win32-utils.c index 4521b9051f..9de0723652 100644 --- a/wsutil/win32-utils.c +++ b/wsutil/win32-utils.c @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "win32-utils.h" diff --git a/wsutil/win32-utils.h b/wsutil/win32-utils.h index f83656a921..9a7658d2b6 100644 --- a/wsutil/win32-utils.h +++ b/wsutil/win32-utils.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2006 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WIN32UTIL_H__ diff --git a/wsutil/ws_cpuid.h b/wsutil/ws_cpuid.h index e7d6af9307..2ba696778d 100644 --- a/wsutil/ws_cpuid.h +++ b/wsutil/ws_cpuid.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/wsutil/ws_mempbrk.c b/wsutil/ws_mempbrk.c index 589cf4550f..bea1e4880c 100644 --- a/wsutil/ws_mempbrk.c +++ b/wsutil/ws_mempbrk.c @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/wsutil/ws_mempbrk.h b/wsutil/ws_mempbrk.h index cc46479075..80bceb4523 100644 --- a/wsutil/ws_mempbrk.h +++ b/wsutil/ws_mempbrk.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WS_MEMPBRK_H__ diff --git a/wsutil/ws_mempbrk_int.h b/wsutil/ws_mempbrk_int.h index c0e75c234f..8f51d8729d 100644 --- a/wsutil/ws_mempbrk_int.h +++ b/wsutil/ws_mempbrk_int.h @@ -4,7 +4,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WS_MEMPBRK_INT_H__ diff --git a/wsutil/ws_pipe.c b/wsutil/ws_pipe.c index eddec9f4dc..8f21014503 100644 --- a/wsutil/ws_pipe.c +++ b/wsutil/ws_pipe.c @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> diff --git a/wsutil/ws_pipe.h b/wsutil/ws_pipe.h index 8787eb7880..8a4870f2cc 100644 --- a/wsutil/ws_pipe.h +++ b/wsutil/ws_pipe.h @@ -6,7 +6,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WS_PIPE_H__ diff --git a/wsutil/ws_printf.h b/wsutil/ws_printf.h index 46d0aca9b8..d603f815df 100644 --- a/wsutil/ws_printf.h +++ b/wsutil/ws_printf.h @@ -5,7 +5,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WS_PRINTF_H__ diff --git a/wsutil/wsgcrypt.c b/wsutil/wsgcrypt.c index b390059e7b..9e3a86055c 100644 --- a/wsutil/wsgcrypt.c +++ b/wsutil/wsgcrypt.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "wsgcrypt.h" diff --git a/wsutil/wsgcrypt.h b/wsutil/wsgcrypt.h index 8c4600c5de..2e764f6c9e 100644 --- a/wsutil/wsgcrypt.h +++ b/wsutil/wsgcrypt.h @@ -9,7 +9,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSGCRYPT_H__ diff --git a/wsutil/wsjsmn.c b/wsutil/wsjsmn.c index e93224eecb..991bf667c2 100644 --- a/wsutil/wsjsmn.c +++ b/wsutil/wsjsmn.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "wsjsmn.h" diff --git a/wsutil/wsjsmn.h b/wsutil/wsjsmn.h index 14baa90811..0ef21ca41e 100644 --- a/wsutil/wsjsmn.h +++ b/wsutil/wsjsmn.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSJSMN_H__ diff --git a/wsutil/wspcap.h b/wsutil/wspcap.h index 53fd175c72..1478803044 100644 --- a/wsutil/wspcap.h +++ b/wsutil/wspcap.h @@ -20,7 +20,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __WSPCAP_H__ diff --git a/wsutil/xtea.c b/wsutil/xtea.c index 407b43366f..6b454f81d2 100644 --- a/wsutil/xtea.c +++ b/wsutil/xtea.c @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <glib.h> diff --git a/wsutil/xtea.h b/wsutil/xtea.h index 22bd1a4d87..2cfeeefb4b 100644 --- a/wsutil/xtea.h +++ b/wsutil/xtea.h @@ -7,7 +7,7 @@ * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __XTEA_H__ |