[msitools: 1/4] wixl: update for openssl 1.1 series

[Marc-André Lureau <malureau src gnome org>]

commit d89d98fcbd8742f444978a40eb92853f79955b10
Author: Daniel P. Berrangé <berrange redhat com>
Date:   Wed Feb 13 10:17:14 2019 +0000

    wixl: update for openssl 1.1 series
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 data/wixl/openssl.wxi | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/data/wixl/openssl.wxi b/data/wixl/openssl.wxi
index 9aa931a..ea3752e 100644
--- a/data/wixl/openssl.wxi
+++ b/data/wixl/openssl.wxi
@@ -5,10 +5,24 @@
     <DirectoryRef Id="INSTALLDIR">
       <Directory Id="dirFB106BD26A5512624D152E1AE91311A5" Name="bin">
         <Component Win64="$(var.Win64)" Id="cmp180069515EEF84E3D64434B53E32E2EF" Guid="*">
-          <File Id="filF246A0BB8301C4720D03942B4C7BA289" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libcrypto-10.dll"/>
+          <?if $(var.Win64) = "yes"?>
+            <File Id="fil69C36901606A417E9E83EC70D1BE5216" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libcrypto-1_1-x64.dll"/>
+          <?else?>
+            <File Id="fil69C36901606A417E9E83EC70D1BE5216" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libcrypto-1_1.dll"/>
+          <?endif?>
         </Component>
         <Component Win64="$(var.Win64)" Id="cmp78BC9637069A326E7860F7EDB381EF4C" Guid="*">
-          <File Id="fil1A5B56C61D6C2137CE2B9BF16C510048" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libssl-10.dll"/>
+          <?if $(var.Win64) = "yes"?>
+            <File Id="fil484753D5C92047DDAB492981DE4F6F5D" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libssl-1_1-x64.dll"/>
+          <?else?>
+            <File Id="fil484753D5C92047DDAB492981DE4F6F5D" KeyPath="yes" 
Source="$(var.SourceDir)/bin/libssl-1_1.dll"/>
+          <?endif?>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmp395C7C6526C74892B8DDBA6FFD21F7A3" Guid="*">
+          <File Id="filC2F467A974504B50AEABE12358B930E7" KeyPath="yes" 
Source="$(var.SourceDir)/bin/make-dummy-cert"/>
+        </Component>
+        <Component Win64="$(var.Win64)" Id="cmp7CAB2ADC32B44CD4B4DB6AF40C4E601C" Guid="*">
+          <File Id="fil64A9A7E5238B40809519518423F98A04" KeyPath="yes" 
Source="$(var.SourceDir)/bin/c_rehash"/>
         </Component>
       </Directory>
       <Directory Id="dir4E367092058C305C8D4A39EA27BB2FE9" Name="etc">
@@ -20,29 +34,11 @@
               <Component Win64="$(var.Win64)" Id="cmpF4AC5E1C8B8F52A9E82B6D444415195E" Guid="*">
                 <File Id="fil92C36E70F9FD6288DBB69D80F59DCFD3" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/certs/Makefile"/>
               </Component>
-              <Component Win64="$(var.Win64)" Id="cmp51EE25AA42FF1DCF63BC0701D92F38DF" Guid="*">
-                <File Id="fil4ECDE8BF72A4B179006F58175D500678" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/certs/make-dummy-cert"/>
-              </Component>
             </Directory>
             <Directory Id="dir41A7BA1ECA217B267001D6C667CDA303" Name="misc">
-              <Component Win64="$(var.Win64)" Id="cmpC79B3522CE340E81091DFF33CE2D4F52" Guid="*">
-                <File Id="filFE341124787DB99FE63D7FE53F069F33" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/CA"/>
-              </Component>
               <Component Win64="$(var.Win64)" Id="cmpF3B98883A02530C5B7BE078B77A99EDD" Guid="*">
                 <File Id="fil3371D8AAA32C7E5720A6BFDB1FA157D3" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/CA.pl"/>
               </Component>
-              <Component Win64="$(var.Win64)" Id="cmp190CBC844CCD760C7D16A8E9394F990E" Guid="*">
-                <File Id="fil56573F782B198F089006988E56A2FDC8" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/c_hash"/>
-              </Component>
-              <Component Win64="$(var.Win64)" Id="cmp10823BB121D6DE4B1D37550D1F26F019" Guid="*">
-                <File Id="filE2605C9FD1B54943EB75E918E5AAAF3F" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/c_info"/>
-              </Component>
-              <Component Win64="$(var.Win64)" Id="cmp538527FD8935FED93D2E66881FFEBDEE" Guid="*">
-                <File Id="filD6292C99C5FA763F88632B21325F09B2" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/c_issuer"/>
-              </Component>
-              <Component Win64="$(var.Win64)" Id="cmp1914CA413F712D03ECF9A7AF1F97E0E9" Guid="*">
-                <File Id="filEB3FDB654D06431F28296F4D99F065C4" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/c_name"/>
-              </Component>
               <Component Win64="$(var.Win64)" Id="cmp227F1DE4BB99FCD6BCF1AE825C00875B" Guid="*">
                 <File Id="fil9FDCC7B3E5AD0709F2E5CBA6544A552F" KeyPath="yes" 
Source="$(var.SourceDir)/etc/pki/tls/misc/tsget"/>
               </Component>