osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

epan,packaging: convert http URLs to https 

Ensure that public text in error messages and dialogs point to https.
Ensure that the generated PDML files include scripts over https.

Change-Id: I75d42704c2bbb33b05492261b3e1d45dc6e301f9
Reviewed-on: https://code.wireshark.org/review/34027
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2019-07-20 16:11:39 +01:00 committed by Anders Broman
parent 0afbedce6d
commit 36e1f782aa
10 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-lapd.c
View File

@ -662,7 +662,7 @@ proto_register_lapd(void)
{ &hf_lapd_checksum,
{ "Checksum", "lapd.checksum", FT_UINT16, BASE_HEX,
NULL, 0x0, "Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
NULL, 0x0, "Details at: https://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
{ &hf_lapd_checksum_status,
{ "Checksum Status", "lapd.checksum.status", FT_UINT8, BASE_NONE,
@ -754,7 +754,7 @@ proto_reg_handoff_lapd(void)
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8

7
epan/dissectors/packet-stt.c
View File

@ -29,8 +29,7 @@ static gboolean pref_reassemble = TRUE;
static gboolean pref_check_checksum = FALSE;
/* IANA ref:
* http://www.iana.org/assignments/service-names-port-numbers/service-
* names-port-numbers.xml
* https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml
*/
#define TCP_PORT_STT 7471
@ -761,7 +760,7 @@ proto_register_stt(void)
{ &hf_stt_checksum,
{ "Checksum", "stt.checksum",
FT_UINT16, BASE_HEX, NULL, 0x0,
"Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL
"Details at: https://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL
},
},
{ &hf_stt_checksum_status,
@ -913,7 +912,7 @@ proto_reg_handoff_stt(void)
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4

4
epan/dissectors/packet-tcp.c
View File

@ -4364,7 +4364,7 @@ get_or_create_mptcpd_from_key(struct tcp_analysis* tcpd, tcp_flow_t *fwd, guint6
* The TCP Extensions for Multipath Operation with Multiple Addresses
* are defined in RFC 6824
*
* <http://http://tools.ietf.org/html/rfc6824>
* https://tools.ietf.org/html/rfc6824
*
* Author: Andrei Maruseac <andrei.maruseac@intel.com>
* Matthieu Coudron <matthieu.coudron@lip6.fr>
@ -6897,7 +6897,7 @@ proto_register_tcp(void)
{ &hf_tcp_checksum,
{ "Checksum", "tcp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
"Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
"Details at: https://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
{ &hf_tcp_checksum_status,
{ "Checksum Status", "tcp.checksum.status", FT_UINT8, BASE_NONE, VALS(proto_checksum_vals), 0x0,

4
epan/dissectors/packet-udp.c
View File

@ -77,7 +77,7 @@ static header_field_info hfi_udp_length UDP_HFI_INIT =
static header_field_info hfi_udp_checksum UDP_HFI_INIT =
{ "Checksum", "udp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
"Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL };
"Details at: https://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL };
static header_field_info hfi_udp_checksum_calculated UDP_HFI_INIT =
{ "Calculated Checksum", "udp.checksum_calculated", FT_UINT16, BASE_HEX, NULL, 0x0,
@ -1392,7 +1392,7 @@ proto_reg_handoff_udp(void)
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 2

4
epan/dissectors/packet-v5dl.c
View File

@ -377,7 +377,7 @@ proto_register_v5dl(void)
#if 0
{ &hf_v5dl_checksum,
{ "Checksum", "v5dl.checksum", FT_UINT16, BASE_HEX,
NULL, 0x0, "Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
NULL, 0x0, "Details at: https://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
{ &hf_v5dl_checksum_status,
{ "Checksum Status", "v5dl.checksum.status", FT_UINT8, BASE_NONE,
@ -414,7 +414,7 @@ proto_reg_handoff_v5dl(void)
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 8

2
epan/oids.c
View File

@ -593,7 +593,7 @@ static void register_mibs(void) {
report_failure("Stopped processing module %s due to "
"error(s) to prevent potential crash in libsmi.\n"
"Module's conformance level: %d.\n"
"See details at: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560325\n",
"See details at: https://bugs.debian.org/560325\n",
smiModule->name, smiModule->conformance);
}
continue;

2
packaging/wix/Wireshark.wxs
View File

@ -13,7 +13,7 @@
.ico file instead of pointing to wireshark.exe.
-->
<?define ProgramsFeaturesIconPath="$(var.IconDir)\wireshark.ico"?>
<Product Id="*" Name="$(var.WiresharkName)" Language="1033" Version="$(var.WiresharkVersion)" Manufacturer="The Wireshark developer community, http://www.wireshark.org/" UpgradeCode="0d67aace-269a-4264-81a3-da8055c1c79c">
<Product Id="*" Name="$(var.WiresharkName)" Language="1033" Version="$(var.WiresharkVersion)" Manufacturer="The Wireshark developer community, https://www.wireshark.org/" UpgradeCode="0d67aace-269a-4264-81a3-da8055c1c79c">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
<!-- Values for Additional Tasks -->
<Property Id="WIRESHARK_START_MENU" Value="1" Secure="yes"/>

4
packaging/wix/WiresharkOptionsDlg.wxs
View File

@ -16,7 +16,7 @@
<!-- BannerLine y = 44, 44 + 7 = 51 -->
<Control Id="NetworkCapture" Type="Text" X="14" Y="51" Width="350" Height="12" Text="{\WixUI_Font_Bold}Wireshark requires Npcap or WinPcap to capture network packets"/>
<Control Id="NetworkCaptureNpcap" Type="Hyperlink" X="20" Y="63" Width="350" Height="11">
<Text><![CDATA[<a href="http://npcap.org">Download Npcap</a> (recommended)]]></Text>
<Text><![CDATA[<a href="https://npcap.org">Download Npcap</a> (recommended)]]></Text>
</Control>
<!-- It looks Hyperlink controls only support one hyperlink, per control. -->
<Control Id="NetworkCaptureWinPcap" Type="Hyperlink" X="20" Y="74" Width="350" Height="11">
@ -26,7 +26,7 @@
<!-- NetworkCaptureWinPcap y = 74, 74 + 8 + 10 = 92 -->
<Control Id="UsbCapture" Type="Text" X="14" Y="92" Width="350" Height="12" Text="{\WixUI_Font_Bold}Wireshark requires USBPcap to capture USB Packets"/>
<Control Id="UsbCaptureUsbPcap" Type="Hyperlink" X="20" Y="104" Width="350" Height="11">
<Text><![CDATA[<a href="http://desowin.org/usbpcap/">Download USBPcap</a> (experimental)]]></Text>
<Text><![CDATA[<a href="https://desowin.org/usbpcap/">Download USBPcap</a> (experimental)]]></Text>
</Control>
<!-- UsbCaptureUsbPcap y = 104, 104 + 8 + 10 = 122 -->

2
pdml2html.xsl
View File

@ -100,7 +100,7 @@
<html>
<head>
<title>poor man's Wireshark</title>
<script src="http://ajax.googleapis.com/ajax/libs/dojo/1.4/dojo/dojo.xd.js" type="text/javascript"></script>
<script src="https://ajax.googleapis.com/ajax/libs/dojo/1.4/dojo/dojo.xd.js" type="text/javascript"></script>
<script type="text/javascript">
function set_node(node, str)
{

6
text2pcap.c
View File

@ -389,7 +389,7 @@ static char tempbuf[64];
* Stuff for writing a PCap file
*/
/* Link-layer type; see http://www.tcpdump.org/linktypes.html for details */
/* Link-layer type; see https://www.tcpdump.org/linktypes.html for details */
static guint32 pcap_link_type = 1; /* Default is LINKTYPE_ETHERNET */
/*----------------------------------------------------------------------
@ -1387,7 +1387,7 @@ print_usage (FILE *output)
"\n"
"Output:\n"
" -l <typenum> link-layer type number; default is 1 (Ethernet). See\n"
" http://www.tcpdump.org/linktypes.html for a list of\n"
" https://www.tcpdump.org/linktypes.html for a list of\n"
" numbers. Use this option if your dump is a complete\n"
" hex dump of an encapsulated packet and you wish to\n"
" specify the exact type of encapsulation.\n"
@ -1925,7 +1925,7 @@ clean_exit:
}
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* Editor modelines - https://www.wireshark.org/tools/modelines.html
*
* Local variables:
* c-basic-offset: 4