aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-06-13 19:51:29 -0400
committerAnders Broman <a.broman58@gmail.com>2016-06-14 03:37:17 +0000
commit238a9846bc1a50251816830deb153187d9509614 (patch)
tree0df385be00d814c93beabc1b1ee055fadf503871 /packaging/nsis
parentda509947a88608d647cd2a04f367ffa54a29cc8e (diff)
Don't register Wireshark for .pfx (IPFIX) files.
(As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files. People may be upset if we start grabbing them. Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498 Reviewed-on: https://code.wireshark.org/review/15886 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis')
-rw-r--r--packaging/nsis/AdditionalTasksPage.ini2
-rwxr-xr-xpackaging/nsis/common.nsh1
2 files changed, 1 insertions, 2 deletions
diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini
index 29e45db352..9e53bb62b0 100644
--- a/packaging/nsis/AdditionalTasksPage.ini
+++ b/packaging/nsis/AdditionalTasksPage.ini
@@ -121,5 +121,5 @@ Left=10
Right=280
Top=130
Bottom=138
-Text=pcapng, pfx, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz
+Text=pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz
diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh
index 3645022b26..9745b74a31 100755
--- a/packaging/nsis/common.nsh
+++ b/packaging/nsis/common.nsh
@@ -106,7 +106,6 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
Push ".rf5"
Push ".pkt"
Push ".pklg"
- Push ".pfx"
Push ".pcapng"
Push ".pcap"
Push ".out"