From 22e7952e06f01c475f427699f5e06578f4b18cf7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 27 Jul 2019 21:20:27 -0700 Subject: [PATCH] HTTPS In Even More Places, update some links. Fall back on the Wayback Machine for some links. Change-Id: I6a44a2caaeb4fa521c2f08196e7c36069e3bb842 Reviewed-on: https://code.wireshark.org/review/34103 Reviewed-by: Guy Harris --- dumpcap.c | 4 ++-- epan/.editorconfig | 2 +- epan/dfilter/.editorconfig | 2 +- epan/dissectors/.editorconfig | 2 +- epan/ftypes/.editorconfig | 2 +- epan/wslua/.editorconfig | 2 +- wireshark.desktop | 4 ++-- wiretap/.editorconfig | 2 +- wiretap/README | 7 +++---- wiretap/camins.c | 2 +- wiretap/commview.c | 2 +- wiretap/dct3trace.c | 4 +++- wiretap/erf.c | 6 ++++-- wiretap/erf.h | 2 +- wiretap/file_wrappers.c | 6 +++--- wiretap/ipfix.c | 4 ++-- wiretap/k12.c | 2 +- wiretap/lanalyzer.c | 2 +- wiretap/mime_file.c | 11 ++++++++--- wiretap/mpeg.c | 2 +- wiretap/mplog.c | 2 +- wiretap/nettrace_3gpp_32_423.c | 2 +- wiretap/pcap-common.c | 4 ++-- wiretap/snoop.c | 6 +++--- wiretap/stanag4607.c | 6 ++++-- wiretap/visual.c | 2 +- writecap/.editorconfig | 2 +- wsutil/.editorconfig | 2 +- 28 files changed, 53 insertions(+), 43 deletions(-) diff --git a/dumpcap.c b/dumpcap.c index 374300b208..5daee8bf89 100644 --- a/dumpcap.c +++ b/dumpcap.c @@ -2407,7 +2407,7 @@ pcap_pipe_dispatch(loop_data *ld, capture_src *pcap_src, char *errmsg, size_t er */ new_bufsize = pcap_info->rechdr.hdr.incl_len; /* - * http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 + * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 */ new_bufsize--; new_bufsize |= new_bufsize >> 1; @@ -2633,7 +2633,7 @@ pcapng_pipe_dispatch(loop_data *ld, capture_src *pcap_src, char *errmsg, size_t */ new_bufsize = bh->block_total_length; /* - * http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 + * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 */ new_bufsize--; new_bufsize |= new_bufsize >> 1; diff --git a/epan/.editorconfig b/epan/.editorconfig index 79a7503f9a..e2574a4f32 100644 --- a/epan/.editorconfig +++ b/epan/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [addr_and_mask.[ch]] diff --git a/epan/dfilter/.editorconfig b/epan/dfilter/.editorconfig index d8f905b8ac..6538af7689 100644 --- a/epan/dfilter/.editorconfig +++ b/epan/dfilter/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [dfilter-macro.[ch]] diff --git a/epan/dissectors/.editorconfig b/epan/dissectors/.editorconfig index 4e05b8dff6..c92cac2d31 100644 --- a/epan/dissectors/.editorconfig +++ b/epan/dissectors/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [file-file.[ch]] diff --git a/epan/ftypes/.editorconfig b/epan/ftypes/.editorconfig index b7c5d2a3f8..aec1739b12 100644 --- a/epan/ftypes/.editorconfig +++ b/epan/ftypes/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [ftype-bytes.[ch]] diff --git a/epan/wslua/.editorconfig b/epan/wslua/.editorconfig index a38057ed7e..d9f4951ad2 100644 --- a/epan/wslua/.editorconfig +++ b/epan/wslua/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [wslua_struct.[ch]] diff --git a/wireshark.desktop b/wireshark.desktop index 334db48076..b2dcf85ff4 100644 --- a/wireshark.desktop +++ b/wireshark.desktop @@ -1,6 +1,6 @@ [Desktop Entry] # The format of this file is specified at -# http://standards.freedesktop.org/desktop-entry-spec/1.0/ +# https://specifications.freedesktop.org/desktop-entry-spec/1.0/ # The entries are in the order they are listed in version 1.0 Type=Application # This is the version of the spec for this file, not the application version. @@ -107,5 +107,5 @@ Exec=wireshark %f Terminal=false MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr; # Category entry according to: -# http://standards.freedesktop.org/menu-spec/1.0/ +# https://specifications.freedesktop.org/menu-spec/1.0/ Categories=Network;Monitor;Qt; diff --git a/wiretap/.editorconfig b/wiretap/.editorconfig index 12b8a6c721..aef8493f41 100644 --- a/wiretap/.editorconfig +++ b/wiretap/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [5views.[ch]] diff --git a/wiretap/README b/wiretap/README index cac38c27b9..7b393ad468 100644 --- a/wiretap/README +++ b/wiretap/README @@ -94,7 +94,7 @@ format; it's supported to the same extent. RADCOM WAN/LAN Analyzers ------------------------ Olivier Abad has added code to read Ethernet and LAPB captures from -RADCOM WAN/LAN Analyzers (see http://www.radcom-inc.com/). +RADCOM WAN/LAN Analyzers (see https://web.archive.org/web/20031231213434/http://www.radcom-inc.com/). Lucent/Ascend access products ----------------------------- @@ -163,7 +163,7 @@ time. DBS Etherwatch (text format) ---------------------------- Text output from DBS Etherwatch is supported. DBS Etherwatch is available -from: http://www.users.bigpond.com/dbsneddon/software.htm. +from: https://web.archive.org/web/20070612033348/http://www.users.bigpond.com/dbsneddon/software.htm. Catapult DCT2000 (.out files) ----------------------------- @@ -183,5 +183,4 @@ Guy Harris STANAG 4607 ----------- Initial support for the STANAG 4607 protocol. Documentation at: -http://www.nato.int/structur/AC/224/standard/4607/4607.htm - +https://web.archive.org/web/20130223054955/http://www.nato.int/structur/AC/224/standard/4607/4607.htm diff --git a/wiretap/camins.c b/wiretap/camins.c index 9ece8352b5..ec25d80469 100644 --- a/wiretap/camins.c +++ b/wiretap/camins.c @@ -100,7 +100,7 @@ typedef enum { #define SIZE_ADD_HIGH \ { size_stat = (size_stat==SIZE_HAVE_LOW ? SIZE_HAVE_ALL : SIZE_HAVE_HIGH); } -/* PCAP DVB-CI pseudo-header, see http://www.kaiser.cx/pcap-dvbci.html */ +/* PCAP DVB-CI pseudo-header, see https://www.kaiser.cx/pcap-dvbci.html */ #define DVB_CI_PSEUDO_HDR_VER 0 #define DVB_CI_PSEUDO_HDR_LEN 4 #define DVB_CI_PSEUDO_HDR_CAM_TO_HOST 0xFF diff --git a/wiretap/commview.c b/wiretap/commview.c index 751d559938..17f67b5746 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -12,7 +12,7 @@ */ /* A brief description of this file format is available at: - * http://www.tamos.com/htmlhelp/commview/logformat.htm + * https://www.tamos.com/htmlhelp/commview/logformat.htm * * Use * diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 6ceb7bb7ee..75237becd6 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -66,7 +66,9 @@ static gboolean dct3trace_seek_read(wtap *wth, gint64 seek_off, wtap_rec *rec, Buffer *buf, int *err, gchar **err_info); /* - * Following 3 functions taken from gsmdecode-0.7bis, with permission - http://wiki.thc.org/gsm + * Following 3 functions taken from gsmdecode-0.7bis, with permission: + * + * https://web.archive.org/web/20091218112927/http://wiki.thc.org/gsm */ static int diff --git a/wiretap/erf.c b/wiretap/erf.c index 78b527036d..267932e599 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -14,8 +14,10 @@ * * See * - * http://www.endace.com/support/EndaceRecordFormat.pdf - * (mirror: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=4333) (bug #4484) + * https://www.endace.com/erf-extensible-record-format-types.pdf + * + * Version 8: + * https://bugs.wireshark.org/bugzilla/attachment.cgi?id=4333 (bug #4484) */ #include "config.h" diff --git a/wiretap/erf.h b/wiretap/erf.h index 1e408ff09f..9b5b456a72 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -5,7 +5,7 @@ * * This software and documentation has been developed by Endace Technology Ltd. * along with the DAG PCI network capture cards. For further information please - * visit http://www.endace.com/. + * visit https://www.endace.com/. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index b9e5e9dcde..d30e5e2327 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -36,11 +36,11 @@ * * Some other compressed file formats we might want to support: * - * XZ format: http://tukaani.org/xz/ + * XZ format: https://tukaani.org/xz/ * - * Bzip2 format: http://bzip.org/ + * Bzip2 format: https://www.sourceware.org/bzip2/ * - * Lzip format: http://www.nongnu.org/lzip/ + * Lzip format: https://www.nongnu.org/lzip/ */ /* diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c index dea32f104d..2827324999 100644 --- a/wiretap/ipfix.c +++ b/wiretap/ipfix.c @@ -12,8 +12,8 @@ /* File format reference: * RFC 5655 and 5101 - * http://tools.ietf.org/rfc/rfc5655 - * http://tools.ietf.org/rfc/rfc5101 + * https://tools.ietf.org/rfc/rfc5655 + * https://tools.ietf.org/rfc/rfc5101 * * This wiretap is for an ipfix file format reader, per RFC 5655/5101. * All "records" in the file are IPFIX messages, beginning with an IPFIX diff --git a/wiretap/k12.c b/wiretap/k12.c index 243625e329..04fb1a8583 100644 --- a/wiretap/k12.c +++ b/wiretap/k12.c @@ -25,7 +25,7 @@ /* * See * - * http://www.tek.com/manual/record-file-api-programmer-manual + * https://www.tek.com/manual/record-file-api-programmer-manual * * for some information about the file format. You may have to fill in * a form to download the document ("Record File API Programmer Manual"). diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 2e45adba55..c0d9c5bba2 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -17,7 +17,7 @@ /* The LANalyzer format is documented (at least in part) in Novell document TID022037, which can be found at, among other places: - http://www.windowsecurity.com/whitepapers/Description_of_the_LANalysers_output_file.html + http://www.blacksheepnetworks.com/security/info/nw/lan/trace.txt */ /* Record header format */ diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c index bec956b198..113c04fbcb 100644 --- a/wiretap/mime_file.c +++ b/wiretap/mime_file.c @@ -42,10 +42,15 @@ typedef struct { /* * Written by Marton Nemeth * Copyright 2009 Marton Nemeth - * The JPEG and JFIF specification can be found at: + * The JPEG specification can be found at: * - * http://www.jpeg.org/public/jfif.pdf - * http://www.w3.org/Graphics/JPEG/itu-t81.pdf + * https://www.w3.org/Graphics/JPEG/itu-t81.pdf + * https://www.itu.int/rec/T-REC-T.81/en (but you have to pay for it) + * + * and the JFIF specification can be found at: + * + * https://www.itu.int/rec/T-REC-T.871-201105-I/en + * https://www.w3.org/Graphics/JPEG/jfif3.pdf */ static const guint8 jpeg_jfif_magic[] = { 0xFF, 0xD8, /* SOF */ 0xFF /* start of the next marker */ diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index b4ffcd4f26..f0704b52ad 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -214,7 +214,7 @@ struct _mpeg_magic { { 3, "TAG" }, /* ID3v1 */ { 3, "ID3" }, /* ID3v2 */ { 3, "\0\0\1" }, /* MPEG PES */ - { 2, "\xff\xfb" }, /* MP3, taken from http://en.wikipedia.org/wiki/MP3#File_structure */ + { 2, "\xff\xfb" }, /* MP3, taken from https://en.wikipedia.org/wiki/MP3#File_structure */ { 0, NULL } }; diff --git a/wiretap/mplog.c b/wiretap/mplog.c index 32b5c700e5..beadb95c43 100644 --- a/wiretap/mplog.c +++ b/wiretap/mplog.c @@ -59,7 +59,7 @@ #define MPLOG_BLOCK_SIZE 8 -/* ISO14443 pseudo-header, see http://www.kaiser.cx/pcap-iso14443.html */ +/* ISO14443 pseudo-header, see https://www.kaiser.cx/pcap-iso14443.html */ #define ISO14443_PSEUDO_HDR_VER 0 #define ISO14443_PSEUDO_HDR_LEN 4 /* the two transfer events are the types that include a trailing CRC diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index a0762fb8ba..fa1481ee41 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -5,7 +5,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * Ref: http://www.3gpp.org/DynaReport/32423.htm + * Ref: https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=2010 */ #include "config.h" diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 7019fe89a7..ee17770c74 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -48,7 +48,7 @@ * values to be used in capture files, and have libpcap map between * those values in capture file headers and the DLT_ values that the * pcap_datalink() and pcap_open_dead() APIs use. See - * http://www.tcpdump.org/linktypes.html for a list of LINKTYPE_ values. + * https://www.tcpdump.org/linktypes.html for a list of LINKTYPE_ values. * * In most cases, the corresponding LINKTYPE_ and DLT_ values are the * same. In the cases where the same link-layer header type was given @@ -1830,7 +1830,7 @@ struct linux_usb_isodesc { /* * USB setup header as defined in USB specification * See usb_20.pdf, Chapter 9.3 'USB Device Requests' for details. - * http://www.usb.org/developers/docs/usb_20_122909-2.zip + * https://www.usb.org/document-library/usb-20-specification * * This structure is 8 bytes long. */ diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 87831d1ddc..1e8b550396 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -88,14 +88,14 @@ static gboolean snoop_dump(wtap_dumper *wdh, const wtap_rec *rec, /* * See * - * http://www.opengroup.org/onlinepubs/9638599/apdxf.htm + * https://pubs.opengroup.org/onlinepubs/9638599/apdxf.htm * * for the "dlpi.h" header file specified by The Open Group, which lists * the DL_ values for various protocols; Solaris 7 uses the same values. * * See * - * http://www.iana.org/assignments/snoop-datalink-types/snoop-datalink-types.xml + * https://www.iana.org/assignments/snoop-datalink-types * * for the IETF list of snoop datalink types. * @@ -155,7 +155,7 @@ static gboolean snoop_dump(wtap_dumper *wdh, const wtap_rec *rec, * if it can't, this may be useful reference information for anybody doing * code to use DLPI to do raw packet captures on those network types. * - * http://web.archive.org/web/20010906213807/http://www.shomiti.com/support/TNCapFileFormat.htm + * https://web.archive.org/web/20010906213807/http://www.shomiti.com/support/TNCapFileFormat.htm * * gives information on Shomiti's mutant flavor of snoop. For some unknown * reason, they decided not to just Go With The DLPI Flow, and instead used diff --git a/wiretap/stanag4607.c b/wiretap/stanag4607.c index 775f8247b1..5a026cdea0 100644 --- a/wiretap/stanag4607.c +++ b/wiretap/stanag4607.c @@ -3,8 +3,10 @@ * STANAG 4607 file reading * * http://www.nato.int/structur/AC/224/standard/4607/4607e_JAS_ED3.pdf - * (that is now missing from that site, but is available on the Wayback - * Machine) + * That is now missing from that site, but is available on the Wayback + * Machine: + * + * https://web.archive.org/web/20130223054955/http://www.nato.int/structur/AC/224/standard/4607/4607.htm * * https://nso.nato.int/nso/zPublic/ap/aedp-7(2).pdf * diff --git a/wiretap/visual.c b/wiretap/visual.c index 7e54f3eacd..1c5e9aac8b 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -193,7 +193,7 @@ wtap_open_return_val visual_open(wtap *wth, int *err, gchar **err_info) } /* Translate the encapsulation type; these values are SNMP ifType - values, as found in http://www.iana.org/assignments/smi-numbers. + values, as found in https://www.iana.org/assignments/smi-numbers. Note that a file with media type 22 ("propPointToPointSerial") may contain Cisco HDLC or PPP over HDLC. This will get sorted out after diff --git a/writecap/.editorconfig b/writecap/.editorconfig index cd0ff58912..1852319ca5 100644 --- a/writecap/.editorconfig +++ b/writecap/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [capture-pcap-util-unix.[ch]] diff --git a/wsutil/.editorconfig b/wsutil/.editorconfig index 7e83fbfaec..afbc3c7747 100644 --- a/wsutil/.editorconfig +++ b/wsutil/.editorconfig @@ -1,7 +1,7 @@ # # Editor configuration # -# http://editorconfig.org/ +# https://editorconfig.org/ # [adler32.[ch]]