KfW make 64-bit MSI include 32-bit dlls

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7293 (new)
queue: kfw
target_version: 1.10.4
tags: pullup

3 files changed, 74 insertions, 37 deletions

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 4fd1d06012..b9406dec8d 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -55,6 +55,16 @@
                     <?include runtime_debug.wxi?>
 	        </Feature>
 	    <?endif?>
+      <?if $(var.Platform)="x64"?>
+          <ComponentRef Id="cmf_comerr64_dll" />
+          <ComponentRef Id="cmf_gssapi64_dll" />
+          <ComponentRef Id="cmf_k5sprt64_dll" />
+          <ComponentRef Id="cmf_krb5_64_dll" />
+          <ComponentRef Id="cmf_krbcc64_dll" />
+          <ComponentRef Id="cmf_leashw64_dll" />
+          <ComponentRef Id="cmf_wshelp64_dll" />
+          <ComponentRef Id="cmf_xpprof64_dll" />
+       <?endif?>
 
             <ComponentRef Id="cmf_comerr32_dll" />
             <ComponentRef Id="cmf_gss_client_exe" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 63339baaf9..abcb3ec7c7 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -292,8 +292,34 @@
                     <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
 	                    <File Id="fil_xpprof32_dll" Name="$(var.cmf_xpprof32_dll_name)" KeyPath="yes" />
                     </Component>
-                    
-                    <!-- Debug symbols -->
+                  <?if $(var.Platform) = "x64"?>
+                    <Component Win64="$(var.Win64)" Id="cmf_krb5_64_dll" Guid="$(var.cmf_krb5_64_dll_guid)" DiskId="1">
+                      <File Id="fil_krb5_64_dll" Name="$(var.cmf_krb5_64_dll_name)" KeyPath="yes" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_k5sprt64_dll" Guid="$(var.cmf_k5sprt64_dll_guid)" DiskId="1">
+                      <File Id="fil_k5sprt64_dll" Name="$(var.cmf_k5sprt64_dll_name)" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_krbcc64_dll" Guid="$(var.cmf_krbcc64_dll_guid)" DiskId="1">
+                      <File Id="fil_krbcc64_dll" Name="$(var.cmf_krbcc64_dll_name)" KeyPath="yes" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_gssapi64_dll" Guid="$(var.cmf_gssapi64_dll_guid)" DiskId="1">
+                      <File Id="fil_gssapi64_dll" Name="$(var.cmf_gssapi64_dll_name)" KeyPath="yes" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_comerr64_dll" Guid="$(var.cmf_comerr64_dll_guid)" DiskId="1">
+                      <File Id="fil_comerr64_dll" Name="$(var.cmf_comerr64_dll_name)" KeyPath="yes" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_leashw64_dll" Guid="$(var.cmf_leashw64_dll_guid)" DiskId="1">
+                      <File Id="fil_leashw64_dll" Name="$(var.cmf_leashw64_dll_name)" KeyPath="yes" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_wshelp64_dll" Guid="$(var.cmf_wshelp64_dll_guid)" DiskId="1">
+                      <File Id="fil_wshelp64_dll" Name="$(var.cmf_wshelp64_dll_name)" KeyPath="yes" />
+                    </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_xpprof64_dll" Guid="$(var.cmf_xpprof64_dll_guid)" DiskId="1">
+                      <File Id="fil_xpprof64_dll" Name="$(var.cmf_xpprof64_dll_name)" KeyPath="yes" />
+                    </Component>
+                  <?endif?>
+
+                  <!-- Debug symbols -->
                 <?ifdef DebugSyms?>
                     <Component Win64="$(var.Win64)" Id="cmf_bin_debug" Guid="$(var.cmf_bin_debug_guid)" DiskId="1">
                         <?if $(var.Platform) = "Intel" ?>
diff --git a/src/windows/installer/wix/platform.wxi b/src/windows/installer/wix/platform.wxi
index fb7f37f6a1..105138633c 100644
--- a/src/windows/installer/wix/platform.wxi
+++ b/src/windows/installer/wix/platform.wxi
@@ -1,7 +1,24 @@
 <?xml version="1.0"?>
 <Include>
 <!-- Platform specific GUID's and other definitions -->
-<?if $(var.Platform) = "x64" ?>
+  <!-- Note that we need 32 bit dlls for both 32 and 64 bit platforms -->
+  <?define cmf_comerr32_dll_guid="D8F455F9-E648-4C61-A69D-7116ADEC2DBB"?>
+  <?define cmf_comerr32_dll_name="comerr32.dll"?>
+  <?define cmf_gssapi32_dll_guid="5B0F2989-BB85-40BF-BB7A-E77693972CF9"?>
+  <?define cmf_gssapi32_dll_name="gssapi32.dll"?>
+  <?define cmf_krb5_32_dll_guid="31E40356-CBAC-4FC6-9A34-C6F6C72A27CA"?>
+  <?define cmf_krb5_32_dll_name="krb5_32.dll"?>
+  <?define cmf_k5sprt32_dll_guid="F2381331-9201-4c02-866F-2038676771D4"?>
+  <?define cmf_k5sprt32_dll_name="k5sprt32.dll"?>
+  <?define cmf_krbcc32_dll_guid="A50FA27D-F203-4C19-9047-B7976171FB94"?>
+  <?define cmf_krbcc32_dll_name="krbcc32.dll"?>
+  <?define cmf_leashw32_dll_guid="8C145D48-A2FC-4C28-BC05-4368545F1184"?>
+  <?define cmf_leashw32_dll_name="leashw32.dll"?>
+  <?define cmf_wshelp32_dll_guid="B9D9F5F1-CA93-4F56-B6F8-343F21484CDE"?>
+  <?define cmf_wshelp32_dll_name="wshelp32.dll"?>
+  <?define cmf_xpprof32_dll_guid="A7DF8BAF-7188-4C24-89FB-C8EB51571FD2"?>
+  <?define cmf_xpprof32_dll_name="xpprof32.dll"?>
+  <?if $(var.Platform) = "x64" ?>
         <?define UpgradeCode="6DA9CD86-6028-4852-8C94-452CAC229244"?>
         <?define PISystemFolder="System64Folder"?>
         <?define PIProgramFilesFolder="ProgramFiles64Folder"?>
@@ -12,16 +29,16 @@
         <?define rcm_krb5_1_guid="21883AD6-1C00-4f1d-9922-477CF63CE6BF"?>
         <?define rcm_krb5_2_guid="88CEA446-4617-46bc-916F-2AAA1E1EACF8"?>
         <?define rcm_krb5_3_guid="28BFF4DB-D09E-4031-AB5D-232F6F707A45"?>
-        <?define cmf_comerr32_dll_guid="3C34EFDA-3F93-4aa6-AA44-718AA25DD346"?>
-        <?define cmf_comerr32_dll_name="comerr64.dll"?>
+        <?define cmf_comerr64_dll_guid="3C34EFDA-3F93-4aa6-AA44-718AA25DD346"?>
+        <?define cmf_comerr64_dll_name="comerr64.dll"?>
         <?define cmf_gss_exe_guid="805EBB97-4860-40d4-A038-5E56717EAFB4"?>
         <?define cmf_gss_client_exe_guid="5F192562-436C-4800-93C7-148F7D46F521"?>
         <?define cmf_gss_server_exe_guid="33651319-01CB-4f2c-9B96-50F0F53E9CDF"?>
-        <?define cmf_gssapi32_dll_guid="ACD1D3FA-3E96-47a6-8A39-88BDA2EA3C9D"?>
-        <?define cmf_gssapi32_dll_name="gssapi64.dll"?>
+        <?define cmf_gssapi64_dll_guid="ACD1D3FA-3E96-47a6-8A39-88BDA2EA3C9D"?>
+        <?define cmf_gssapi64_dll_name="gssapi64.dll"?>
         <?define cmf_k524init_exe_guid="63630B70-D9B1-47bc-905D-E4DFA6F9D0D1"?>
-        <?define cmf_kclnt32_dll_guid="C26B3CAA-607C-42db-956C-9AA379CCE892"?>
-        <?define cmf_kclnt32_dll_name="kclnt64.dll"?>
+        <?define cmf_kclnt64_dll_guid="C26B3CAA-607C-42db-956C-9AA379CCE892"?>
+        <?define cmf_kclnt64_dll_name="kclnt64.dll"?>
         <?define cmf_kdestroy_exe_guid="58AB2858-3513-4e4d-B76C-915B0D0DEE82"?>
         <?define cmf_kcpytkt_exe_guid="B2BA9697-4E42-433d-BA85-79A49A622D84"?>
         <?define cmf_kdeltkt_exe_guid="998BF60D-75EF-4807-BDA3-7DDE47C4F00F"?>
@@ -30,14 +47,14 @@
         <?define cmf_kpasswd_exe_guid="669A2965-413F-4003-9F43-4615CC7C3B1A"?>
         <?define cmf_kswitch_exe_guid="EFBA642C-D1E8-441b-A31D-8B44715B2EAB"?>
         <?define cmf_kvno_exe_guid="56C95EBA-2A53-4567-AA44-9A0EE01BB390"?>
-        <?define cmf_krb5_32_dll_guid="8B7190D6-76BD-442b-893B-1EED4E26EC0A"?>
-        <?define cmf_krb5_32_dll_name="krb5_64.dll"?>
-        <?define cmf_k5sprt32_dll_guid="2DD8CE7D-8C8E-4cfb-BC73-765858DD1418"?>
-        <?define cmf_k5sprt32_dll_name="k5sprt64.dll"?>
+        <?define cmf_krb5_64_dll_guid="8B7190D6-76BD-442b-893B-1EED4E26EC0A"?>
+        <?define cmf_krb5_64_dll_name="krb5_64.dll"?>
+        <?define cmf_k5sprt64_dll_guid="2DD8CE7D-8C8E-4cfb-BC73-765858DD1418"?>
+        <?define cmf_k5sprt64_dll_name="k5sprt64.dll"?>
         <?define cmf_krb524_dll_guid="4FAFB2A6-FC42-466b-9A86-42C3150252E2"?>
         <?define cmf_krb524_dll_name="krb524.dll"?>
-        <?define cmf_krbcc32_dll_guid="56DAD1B9-4A59-46e6-81CA-54E2B6C9D618"?>
-        <?define cmf_krbcc32_dll_name="krbcc64.dll"?>
+        <?define cmf_krbcc64_dll_guid="56DAD1B9-4A59-46e6-81CA-54E2B6C9D618"?>
+        <?define cmf_krbcc64_dll_name="krbcc64.dll"?>
         <?define cmf_ccapiserver_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>
         <?define cmf_ccapiserver_exe_name="ccapiserver.exe"?>
         <?define cmf_krbv4w32_dll_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
@@ -53,8 +70,8 @@
         <?define csc_LeashStartup_guid="228192C5-D847-4c46-A726-0E8211742349"?>
         <?define cmf_leash32_hlp_guid="EF1B0ED6-9C01-4adb-9F11-C3FF07F669D5"?>
         <?define cmf_leash32_chm_guid="769B54EB-9B96-4abe-9B72-9EF346C8C03D"?>
-        <?define cmf_leashw32_dll_guid="7222B9E1-EE70-4ccb-929F-43D45574AA83"?>
-        <?define cmf_leashw32_dll_name="leashw64.dll"?>
+        <?define cmf_leashw64_dll_guid="7222B9E1-EE70-4ccb-929F-43D45574AA83"?>
+        <?define cmf_leashw64_dll_name="leashw64.dll"?>
         <?define rcm_leashdll_1_guid="64BC62DF-F1D6-423a-B4E0-E75E214BAC26"?>
         <?define rcm_leashdll_2_guid="2CEF4DC7-684B-4a53-9053-5EB26264B009"?>
         <?define rcm_leashdll_3_guid="D93DE8B4-919E-48ef-812D-BFCC26460608"?>
@@ -74,10 +91,10 @@
         <?define rcm_leashdll_17_guid="E5F8A4DF-442E-4d24-B5E2-9F36A4F7E15D"?>
         <?define cmf_ms2mit_exe_guid="8AEC1FDA-4A45-4878-8C0B-465D46ACE306"?>
         <?define cmf_mit2ms_exe_guid="3CE7BAE8-22DA-4911-B370-4C700861BDFD"?>
-        <?define cmf_wshelp32_dll_guid="24648FE7-D952-499c-8023-AFE4C7E52296"?>
-        <?define cmf_wshelp32_dll_name="wshelp64.dll"?>
-        <?define cmf_xpprof32_dll_guid="B1112677-50A4-4430-846B-F824C859E3DF"?>
-        <?define cmf_xpprof32_dll_name="xpprof64.dll"?>
+        <?define cmf_wshelp64_dll_guid="24648FE7-D952-499c-8023-AFE4C7E52296"?>
+        <?define cmf_wshelp64_dll_name="wshelp64.dll"?>
+        <?define cmf_xpprof64_dll_guid="B1112677-50A4-4430-846B-F824C859E3DF"?>
+        <?define cmf_xpprof64_dll_name="xpprof64.dll"?>
         <?define cmf_nidmgr32_dll_guid="8538212A-9BD5-4d62-BF29-36D853385F0A"?>
         <?define cmf_nidmgr32_dll_name="nidmgr64.dll"?>
         <?define cmf_nidmgr32_dll_w2k_guid="01655D48-C596-48f8-A0C3-5DB3FC833444"?>
@@ -97,13 +114,9 @@
         <?define rcm_krb5_1_guid="E190F8B9-51FA-4FB1-884C-C8AFA37F8653"?>
         <?define rcm_krb5_2_guid="AE7D4305-6193-4094-8C82-73862AE01DCE"?>
         <?define rcm_krb5_3_guid="853EE035-99AA-489A-8FB6-74C76624E92A"?>
-        <?define cmf_comerr32_dll_guid="D8F455F9-E648-4C61-A69D-7116ADEC2DBB"?>
-        <?define cmf_comerr32_dll_name="comerr32.dll"?>
         <?define cmf_gss_exe_guid="8CAF09C4-68A2-46DC-A618-AEF16D832E54"?>
         <?define cmf_gss_client_exe_guid="983E0887-0C8B-49AB-8F59-DFE3A4E45E89"?>
         <?define cmf_gss_server_exe_guid="B165FE41-D0DD-4DFC-92E6-A99ADA23BE8B"?>
-        <?define cmf_gssapi32_dll_guid="5B0F2989-BB85-40BF-BB7A-E77693972CF9"?>
-        <?define cmf_gssapi32_dll_name="gssapi32.dll"?>
         <?define cmf_k524init_exe_guid="20BE4EA5-C465-4AF3-9A4F-BB80934167E3"?>
         <?define cmf_kclnt32_dll_guid="D396C1E7-080E-49F5-92BA-73BCEDF09C8E"?>
         <?define cmf_kclnt32_dll_name="kclnt32.dll"?>
@@ -115,14 +128,8 @@
         <?define cmf_kpasswd_exe_guid="3FA4AB96-FF12-460A-814E-3380E220787C"?>
         <?define cmf_kswitch_exe_guid="C1A575D3-DEF3-4fce-861E-9C6BA7F93072"?>
         <?define cmf_kvno_exe_guid="7759D524-1F88-4483-975F-DDD33A511512"?>
-        <?define cmf_krb5_32_dll_guid="31E40356-CBAC-4FC6-9A34-C6F6C72A27CA"?>
-        <?define cmf_krb5_32_dll_name="krb5_32.dll"?>
-        <?define cmf_k5sprt32_dll_guid="F2381331-9201-4c02-866F-2038676771D4"?>
-        <?define cmf_k5sprt32_dll_name="k5sprt32.dll"?>
         <?define cmf_krb524_dll_guid="98685874-A9AA-4BC5-9830-271D9CF52C17"?>
         <?define cmf_krb524_dll_name="krb524.dll"?>
-        <?define cmf_krbcc32_dll_guid="A50FA27D-F203-4C19-9047-B7976171FB94"?>
-        <?define cmf_krbcc32_dll_name="krbcc32.dll"?>
         <?define cmf_ccapiserver_exe_guid="7D5F0817-DACF-4B54-BB8D-94DD63626DB5"?>
         <?define cmf_ccapiserver_exe_name="ccapiserver.exe"?>
         <?define cmf_krbv4w32_dll_guid="DFA23F6C-5297-4876-AF52-6F7CF2CB34AC"?>
@@ -138,8 +145,6 @@
         <?define csc_LeashStartup_guid="0DF73BCD-F34E-4B01-AA71-0EE08EB62F70"?>
         <?define cmf_leash32_hlp_guid="919616D6-1605-4A79-8E33-C18A0D0F25E3"?>
         <?define cmf_leash32_chm_guid="C50E5E0A-B822-4419-855B-1713637BCA6A"?>
-        <?define cmf_leashw32_dll_guid="8C145D48-A2FC-4C28-BC05-4368545F1184"?>
-        <?define cmf_leashw32_dll_name="leashw32.dll"?>
         <?define rcm_leashdll_1_guid="54C949DA-AF1E-4412-81AF-F502BD5904D2"?>
         <?define rcm_leashdll_2_guid="9B553794-45E7-49FB-B6D9-1C3C9BB6E00D"?>
         <?define rcm_leashdll_3_guid="E3D1284C-17F6-41E3-9AA7-2ED05432060F"?>
@@ -159,10 +164,6 @@
         <?define rcm_leashdll_17_guid="1B685E1B-32F2-49A5-9B7D-4288741A2C17"?>
         <?define cmf_ms2mit_exe_guid="63D189DC-5EE4-49E2-B5E9-6E74A28602C8"?>
         <?define cmf_mit2ms_exe_guid="4F487781-5B55-48c1-A3FA-8BC6ECA4FEA1"?>
-        <?define cmf_wshelp32_dll_guid="B9D9F5F1-CA93-4F56-B6F8-343F21484CDE"?>
-        <?define cmf_wshelp32_dll_name="wshelp32.dll"?>
-        <?define cmf_xpprof32_dll_guid="A7DF8BAF-7188-4C24-89FB-C8EB51571FD2"?>
-        <?define cmf_xpprof32_dll_name="xpprof32.dll"?>
         <?define cmf_krb5cred_dll_guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3"?>
         <?define cmf_krb5cred_dll_name="krb5cred.dll"?>
         <?define cmf_krb5cred_en_us_dll_guid="EA9ABE05-A85B-43BB-8741-50D3C3128632"?>