aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wiretap/ascend.y15
-rw-r--r--wiretap/ascend_scanner.l15
-rw-r--r--wiretap/camins.c15
-rw-r--r--wiretap/camins.h15
-rw-r--r--wiretap/catapult_dct2000.h15
-rw-r--r--wiretap/commview.c16
-rw-r--r--wiretap/commview.h16
-rw-r--r--wiretap/daintree-sna.c16
-rw-r--r--wiretap/daintree-sna.h16
-rw-r--r--wiretap/dct3trace.c15
-rw-r--r--wiretap/k12.h15
-rw-r--r--wiretap/k12text.l15
-rw-r--r--wiretap/merge.c15
-rw-r--r--wiretap/mime_file.c15
-rw-r--r--wiretap/mplog.c15
-rw-r--r--wiretap/mplog.h15
-rw-r--r--wiretap/nettl.c15
-rw-r--r--wiretap/nettl.h15
-rw-r--r--wiretap/packetlogger.c16
-rw-r--r--wiretap/packetlogger.h16
-rw-r--r--wiretap/peekclassic.c15
-rw-r--r--wiretap/peektagged.c15
-rw-r--r--wiretap/wtap.h15
23 files changed, 23 insertions, 328 deletions
diff --git a/wiretap/ascend.y b/wiretap/ascend.y
index cc1bda085f..56f88b58de 100644
--- a/wiretap/ascend.y
+++ b/wiretap/ascend.y
@@ -29,20 +29,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+* SPDX-License-Identifier: GPL-2.0+ *
*/
/*
diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l
index e182b243d1..cba58e779e 100644
--- a/wiretap/ascend_scanner.l
+++ b/wiretap/ascend_scanner.l
@@ -54,20 +54,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#include <stdlib.h>
#include <string.h>
diff --git a/wiretap/camins.c b/wiretap/camins.c
index 65dda8d2f2..0d1ce001f7 100644
--- a/wiretap/camins.c
+++ b/wiretap/camins.c
@@ -7,20 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
/* CAM Inspector is a commercial log tool for DVB-CI
diff --git a/wiretap/camins.h b/wiretap/camins.h
index cf1a4cc86e..f4423c658c 100644
--- a/wiretap/camins.h
+++ b/wiretap/camins.h
@@ -7,20 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _CAMINS_H
#define _CAMINS_H
diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h
index 250ca95843..9b3748311d 100644
--- a/wiretap/catapult_dct2000.h
+++ b/wiretap/catapult_dct2000.h
@@ -3,20 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+* SPDX-License-Identifier: GPL-2.0+*/
#ifndef __W_CAT_DCT2K_H__
#define __W_CAT_DCT2K_H__
diff --git a/wiretap/commview.c b/wiretap/commview.c
index 77d3a6121e..e0b360e310 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -8,21 +8,7 @@
*
* Based on csids.c and nettl.c
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
/* A brief description of this file format is available at:
* http://www.tamos.com/htmlhelp/commview/logformat.htm
diff --git a/wiretap/commview.h b/wiretap/commview.h
index 74dc53ed91..a7e4e1eceb 100644
--- a/wiretap/commview.h
+++ b/wiretap/commview.h
@@ -4,21 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#ifndef __COMMVIEW_H__
#define __COMMVIEW_H__
diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c
index b1016fa072..26cf289bd9 100644
--- a/wiretap/daintree-sna.c
+++ b/wiretap/daintree-sna.c
@@ -11,21 +11,7 @@
* remains. Borrowed many snippets from dbs-etherwatch.c, the
* daintree_sna_process_hex_data function having the largest chunk.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
/* This module reads capture files saved by Daintree's Sensor Network Analyzer.
* Daintree captures are plain text files with a two line header,
diff --git a/wiretap/daintree-sna.h b/wiretap/daintree-sna.h
index 008056f144..278e4acbd2 100644
--- a/wiretap/daintree-sna.h
+++ b/wiretap/daintree-sna.h
@@ -4,21 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- *
+* SPDX-License-Identifier: GPL-2.0+ *
*/
#ifndef __DAINTREE_SNA_H__
diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c
index ac22dc5f2f..478bb9a92d 100644
--- a/wiretap/dct3trace.c
+++ b/wiretap/dct3trace.c
@@ -9,20 +9,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+*/
#include "config.h"
#include "wtap-int.h"
diff --git a/wiretap/k12.h b/wiretap/k12.h
index aa2fc53b2b..8f3c1f2bc2 100644
--- a/wiretap/k12.h
+++ b/wiretap/k12.h
@@ -3,20 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+* SPDX-License-Identifier: GPL-2.0+*/
#ifndef __W_K12_H__
#define __W_K12_H__
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index fd4425bd00..7e031de6fc 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -79,20 +79,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
/*
* TODO:
diff --git a/wiretap/merge.c b/wiretap/merge.c
index b1eb8971f0..7c89039d1a 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -9,20 +9,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#include "config.h"
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index 951be17090..502bd1a91a 100644
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -12,20 +12,7 @@
* off to heuristic dissectors to try to identify the file's contents.
*
* Wiretap Library
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+*/
#include "config.h"
diff --git a/wiretap/mplog.c b/wiretap/mplog.c
index db8b94a066..8ca5e3fc9c 100644
--- a/wiretap/mplog.c
+++ b/wiretap/mplog.c
@@ -7,20 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
/*
diff --git a/wiretap/mplog.h b/wiretap/mplog.h
index 77561ffbb6..e4c7743b81 100644
--- a/wiretap/mplog.h
+++ b/wiretap/mplog.h
@@ -7,20 +7,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _MPLOG_H
#define _MPLOG_H
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index 533fa8678e..e46c4c0198 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -6,20 +6,7 @@
* Enhancements by Mark C. Brown <mbrown@hp.com>
* Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#include "config.h"
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index b54b9bc334..0142e98de8 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -6,20 +6,7 @@
* Enhancements by Mark C. Brown <mbrown@hp.com>
* Copyright (C) 2003, 2005 Hewlett-Packard Development Company, L.P.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#ifndef __NETTL_H__
#define __NETTL_H__
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c
index 909371543b..c8d8b80e3c 100644
--- a/wiretap/packetlogger.c
+++ b/wiretap/packetlogger.c
@@ -9,21 +9,7 @@
* Based on commview.c, Linux's BlueZ-Gnome Analyzer program and hexdumps of
* the output files from Apple's PacketLogger tool.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#include "config.h"
diff --git a/wiretap/packetlogger.h b/wiretap/packetlogger.h
index 1ed8b05595..19cf0b8476 100644
--- a/wiretap/packetlogger.h
+++ b/wiretap/packetlogger.h
@@ -4,21 +4,7 @@
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- *
+* SPDX-License-Identifier: GPL-2.0+ *
*/
#ifndef __PACKETLOGGER_H__
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c
index a0fce6d6f7..e929089fca 100644
--- a/wiretap/peekclassic.c
+++ b/wiretap/peekclassic.c
@@ -18,20 +18,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#include "config.h"
#include <errno.h>
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index b9f76a3a93..798bf8e0b6 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -15,20 +15,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#include "config.h"
#include <errno.h>
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 13e97829f7..96854f8001 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -3,20 +3,7 @@
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
+* SPDX-License-Identifier: GPL-2.0+ */
#ifndef __WTAP_H__
#define __WTAP_H__