aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-mime-package.xml
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 /wireshark-mime-package.xml
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 'wireshark-mime-package.xml')
-rw-r--r--wireshark-mime-package.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/wireshark-mime-package.xml b/wireshark-mime-package.xml
index 0e5fb1f869..51114fd4f7 100644
--- a/wireshark-mime-package.xml
+++ b/wireshark-mime-package.xml
@@ -193,10 +193,9 @@
<mime-type type="application/ipfix">
<comment>Packet Capture (IPFIX)</comment>
<generic-icon name="application-wireshark-doc"/>
- <glob pattern="*.pfx"/>
<glob pattern="*.ipfix"/>
- <glob pattern="*.pfx.gz"/>
<glob pattern="*.ipfix.gz"/>
+ <!-- Don't register for .pfx: that extension has another (more common) use -->
</mime-type>
<mime-type type="application/x-ixia-vwr">