diff options
author | Peter Wu <peter@lekensteyn.nl> | 2019-07-20 16:11:39 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-07-20 20:50:59 +0000 |
commit | 36e1f782aa26fbaccffae5287be5a7ca0159e4ce (patch) | |
tree | 27e70147d91e45360dade239dccf11e340002dba /packaging/wix | |
parent | 0afbedce6d14c9a687777444ade8b31feecc5e5f (diff) |
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>
Diffstat (limited to 'packaging/wix')
-rw-r--r-- | packaging/wix/Wireshark.wxs | 2 | ||||
-rw-r--r-- | packaging/wix/WiresharkOptionsDlg.wxs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/wix/Wireshark.wxs b/packaging/wix/Wireshark.wxs index a74a488636..98e35335d2 100644 --- a/packaging/wix/Wireshark.wxs +++ b/packaging/wix/Wireshark.wxs @@ -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"/> diff --git a/packaging/wix/WiresharkOptionsDlg.wxs b/packaging/wix/WiresharkOptionsDlg.wxs index 42f865f3cb..1b55dbb61a 100644 --- a/packaging/wix/WiresharkOptionsDlg.wxs +++ b/packaging/wix/WiresharkOptionsDlg.wxs @@ -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 --> |