From 238a9846bc1a50251816830deb153187d9509614 Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss.ws@gmail.com>
Date: Mon, 13 Jun 2016 19:51:29 -0400
Subject: 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>
---
 packaging/wix/ComponentGroups.wxi | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'packaging/wix/ComponentGroups.wxi')

diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi
index 34e54199b5..0013a62c3e 100644
--- a/packaging/wix/ComponentGroups.wxi
+++ b/packaging/wix/ComponentGroups.wxi
@@ -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="&quot;%1&quot;"/>
-          </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="&quot;%1&quot;"/>
-          </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">
-- 
cgit v1.2.3