From 90fb40f65e028b9337b224364076734fad8afc49 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Wed, 30 Sep 2015 07:13:59 +0200
Subject: [PATCH] include zlib1.dll and libeay32.dll in installer

---
 win32/Make.rules.mak |  8 ++++----
 win32/OpenSC.wxs.in  | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 494b662a..1f8deb90 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -48,8 +48,7 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MT.lib user32.
 PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \
 	westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe
 OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
-!ELSE
-CANDLEFLAG_LIGHT = -dLight
+CANDLEFLAGS = -dOpenSSL="$(OPENSSL_DIR)" $(CANDLEFLAGS)
 !ENDIF
 
 
@@ -63,6 +62,7 @@ CANDLEFLAG_LIGHT = -dLight
 ZLIB_INCL_DIR = /IC:\zlib-dll\include
 ZLIB_LIB = C:\zlib-dll\lib\zdll.lib
 OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
+CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
 !ENDIF
 
 # Used for MiniDriver
@@ -90,11 +90,11 @@ COPTS =  /W3 /D_CRT_SECURE_NO_DEPRECATE /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUD
 !IF "$(BUILD_FOR)" == "WIN64"
 LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X64 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD  /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
 LIBFLAGS =  /nologo /machine:x64
-CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAG_LIGHT)
+CANDLEFLAGS = -dPlatform=x64 $(CANDLEFLAGS)
 !ELSE
 LINKFLAGS = /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /MANIFEST:NO /NODEFAULTLIB:MSVCRTD  /NODEFAULTLIB:MSVCRT $(LINKDEBUGFLAGS)
 LIBFLAGS =  /nologo /machine:x86
-CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAG_LIGHT)
+CANDLEFLAGS = -dPlatform=x86 $(CANDLEFLAGS)
 !ENDIF
 .c.obj::
 	cl $(CODE_OPTIMIZATION) $(COPTS) /c $<
diff --git a/win32/OpenSC.wxs.in b/win32/OpenSC.wxs.in
index 95f5a366..5c8ef82a 100644
--- a/win32/OpenSC.wxs.in
+++ b/win32/OpenSC.wxs.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <?if $(var.Platform) = x64 ?>
-  <?ifdef Light ?>
+  <?ifndef OpenSSL ?>
     <?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light (64bit)" ?>
   <?else ?>
     <?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ (64bit)" ?>
@@ -10,7 +10,7 @@
   <?define PlatformSystemFolder = "System64Folder" ?>
   <?define PlatformUpgradeCode = "{9A449570-69A2-11E0-9CC6-955B4824019B}" ?>
 <?else ?>
-  <?ifdef Light ?>
+  <?ifndef OpenSSL ?>
     <?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ Light" ?>
   <?else ?>
     <?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@" ?>
@@ -116,6 +116,11 @@
 
             <!-- Tools have their own folder -->
             <Directory Id="INSTALLDIR_TOOLS" Name="tools">
+              <?ifdef zlib ?>
+                <Component Id="zlib1.dll" Guid="*" Win64="$(var.Win64YesNo)">
+                  <File Source="$(var.zlib)\zlib1.dll" Vital="yes"/>
+                </Component>
+              <?endif ?>
               <Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
                 <File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
               </Component>
@@ -146,7 +151,10 @@
               <Component Id="iasecc_tool.exe" Guid="*" Win64="$(var.Win64YesNo)">
                 <File Source="$(var.SOURCE_DIR)\src\tools\iasecc-tool.exe" Vital="yes"/>
               </Component>
-              <?ifndef Light ?>
+              <?ifdef OpenSSL ?>
+                <Component Id="libeay32.dll" Guid="*" Win64="$(var.Win64YesNo)">
+                  <File Source="$(var.OpenSSL)\libeay32.dll" Vital="yes"/>
+                </Component>
                 <Component Id="smm_local.dll" Guid="*" Win64="$(var.Win64YesNo)">
                   <File Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" Vital="yes"/>
                 </Component>
@@ -173,7 +181,7 @@
                 </Component>
               <?endif ?>
             </Directory>
-            <?ifndef Light ?>
+            <?ifdef OpenSSL ?>
               <Directory Id="INSTALLDIR_PROFILES" Name="profiles">
                 <Component Id="cyberflex.profile" Guid="*" Win64="$(var.Win64YesNo)">
                   <File Source="$(var.SOURCE_DIR)\src\pkcs15init\cyberflex.profile"/>
@@ -284,8 +292,12 @@
     <Feature Id="Complete" Level="1" Title="OpenSC software suite" Display="expand">
       <Feature Id="OpenSC_core" Level="1" Title="OpenSC core library" Description="Core DLL and configuration file used by all other components." Absent="disallow">
         <ComponentRef Id="opensc.dll"/>
+        <?ifdef zlib ?>
+          <ComponentRef Id="zlib1.dll"/>
+        <?endif ?>
         <ComponentRef Id="opensc.conf"/>
-        <?ifndef Light ?>
+        <?ifdef OpenSSL ?>
+          <ComponentRef Id="libeay32.dll"/>
           <ComponentRef Id="smm_local.dll"/>
         <?endif ?>
       </Feature>
@@ -311,7 +323,7 @@
         <ComponentRef Id="pkcs15_crypt.exe"/>
         <ComponentRef Id="openpgp_tool.exe"/>
         <ComponentRef Id="iasecc_tool.exe"/>
-        <?ifndef Light ?>
+        <?ifdef OpenSSL ?>
           <ComponentRef Id="cryptoflex_tool.exe"/>
           <ComponentRef Id="pkcs15_init.exe"/>
           <ComponentRef Id="netkey_tool.exe"/>