forked from osmocom/wireshark
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>
This commit is contained in:
parent
da509947a8
commit
238a9846bc
|
@ -76,9 +76,10 @@
|
|||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>ipfix</string>
|
||||
<string>pfx</string>
|
||||
<string>ipfix.gz</string>
|
||||
<string>pfx.gz</string>
|
||||
<!-- Don't register for .pfx: that extension
|
||||
has another (more common) use.
|
||||
-->
|
||||
</array>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>Wiresharkdoc.icns</string>
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -106,7 +106,6 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
|
|||
Push ".rf5"
|
||||
Push ".pkt"
|
||||
Push ".pklg"
|
||||
Push ".pfx"
|
||||
Push ".pcapng"
|
||||
Push ".pcap"
|
||||
Push ".out"
|
||||
|
|
|
@ -663,15 +663,6 @@
|
|||
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/>
|
||||
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
|
||||
</Component>
|
||||
<Component Id="cmpFApfx">
|
||||
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pfx">
|
||||
<Extension Id="pfx">
|
||||
<Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument=""%1""/>
|
||||
</Extension>
|
||||
</ProgId>
|
||||
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pfx" Type="integer" Value="1" KeyPath="yes"/>
|
||||
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
|
||||
</Component>
|
||||
<Component Id="cmpFApcap">
|
||||
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap">
|
||||
<Extension Id="pcap">
|
||||
|
@ -913,15 +904,6 @@
|
|||
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/>
|
||||
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
|
||||
</Component>
|
||||
<Component Id="cmpFApfxLegacy" Guid="BED5062C-1D71-4EE5-A7D6-AE8E576A3DA8">
|
||||
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pfx">
|
||||
<Extension Id="pfx">
|
||||
<Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument=""%1""/>
|
||||
</Extension>
|
||||
</ProgId>
|
||||
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pfx" Type="integer" Value="1" KeyPath="yes"/>
|
||||
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
|
||||
</Component>
|
||||
<Component Id="cmpFApcapLegacy" Guid="B419D3B0-2ECA-4F56-A23B-56A9A3FAAB35">
|
||||
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap">
|
||||
<Extension Id="pcap">
|
||||
|
|
|
@ -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">
|
||||
|
|
Loading…
Reference in New Issue