From 85c7ba0c7e6c0d95909c8c39838108673768a41b Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Sun, 16 Nov 2014 10:06:43 -0800
Subject: [PATCH] IIS: Adds ssdeep/libfuzzy to msi installer

fuzzy.dll should be installed by the ModSecurityIIS installer.
---
 iis/build_release.bat |  5 ++++-
 iis/installer.wxs     | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/iis/build_release.bat b/iis/build_release.bat
index 4b4e7fec..68bc5871 100644
--- a/iis/build_release.bat
+++ b/iis/build_release.bat
@@ -17,6 +17,7 @@ mkdir "%X86%"
 set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"
 set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
 
+set SSDEEP_ARCH="x64"
 call build_dependencies.bat %VCARGS64%
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 call build_modsecurity.bat %VCARGS64%
@@ -33,8 +34,9 @@ copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\zlib1.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\yajl.dll" "%AMD64%"
+copy "%OUTPUT_DIR%\fuzzy.dll" "%AMD64%"
 
-
+set SSDEEP_ARCH="x86"
 call build_dependencies.bat %VCARGS32%
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 call build_modsecurity.bat %VCARGS32%
@@ -51,6 +53,7 @@ copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%X86%"
 copy "%OUTPUT_DIR%\pcre.dll" "%X86%"
 copy "%OUTPUT_DIR%\zlib1.dll" "%X86%"
 copy "%OUTPUT_DIR%\yajl.dll" "%X86%"
+copy "%OUTPUT_DIR%\fuzzy.dll" "%X86%"
 
 
 :: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR%
diff --git a/iis/installer.wxs b/iis/installer.wxs
index ac3ccc80..0b98b35a 100644
--- a/iis/installer.wxs
+++ b/iis/installer.wxs
@@ -83,6 +83,9 @@
             <DirectorySearch Id="CheckFileDir18" Path="C:\Windows\System32\inetsrv" Depth="0">
                 <FileSearch Id="CheckFile18" Name="zlib1.dll" />
             </DirectorySearch>
+            <DirectorySearch Id="CheckFileDir19" Path="C:\Windows\System32\inetsrv" Depth="0">
+                <FileSearch Id="CheckFile19" Name="fuzzy.dll" />
+            </DirectorySearch>
         </Property>
         <Property Id="WWWROOT">
             <RegistrySearch Id="FindInetPubFolder" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp" Name="PathWWWRoot" Type="directory" />
@@ -323,9 +326,9 @@
                         <Shortcut Id="EULA" Name="EULA" Description="EULA" Target="[INSTALLFOLDER]EULA.rtf" WorkingDirectory="INSTALLFOLDER" />
                         <Shortcut Id="Readme" Name="EULA" Description="EULA" Target="[INSTALLFOLDER]README.TXT" WorkingDirectory="INSTALLFOLDER" />
                         <?if $(var.Win64) = "yes" ?>
-                        <Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv64]libapr-1.dll&quot; &quot;[inetsrv64]libapriconv-1.dll&quot; &quot;[inetsrv64]libaprutil-1.dll&quot; &quot;[inetsrv64]libcurl.dll&quot; &quot;[inetsrv64]libxml2.dll&quot; &quot;[inetsrv64]lua5.1.dll&quot; &quot;[inetsrv64]mlogc.exe&quot; &quot;[inetsrv64]ModSecurityIIS.dll&quot; &quot;[inetsrv64]pcre.dll&quot; &quot;[inetsrv64]zlib1.dll&quot; &quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
+                        <Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv64]libapr-1.dll&quot; &quot;[inetsrv64]libapriconv-1.dll&quot; &quot;[inetsrv64]libaprutil-1.dll&quot; &quot;[inetsrv64]libcurl.dll&quot; &quot;[inetsrv64]libxml2.dll&quot; &quot;[inetsrv64]lua5.1.dll&quot; &quot;[inetsrv64]mlogc.exe&quot; &quot;[inetsrv64]ModSecurityIIS.dll&quot; &quot;[inetsrv64]pcre.dll&quot; &quot;[inetsrv64]zlib1.dll&quot; &quot;[inetsrv64]fuzzy.dll&quot; &quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot;  &quot;[inetsrv32]fuzzy.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
                         <?else ?>
-                        <Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
+                        <Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments="&quot;[inetsrv32]libapr-1.dll&quot; &quot;[inetsrv32]libapriconv-1.dll&quot; &quot;[inetsrv32]libaprutil-1.dll&quot; &quot;[inetsrv32]libcurl.dll&quot; &quot;[inetsrv32]libxml2.dll&quot; &quot;[inetsrv32]lua5.1.dll&quot; &quot;[inetsrv32]mlogc.exe&quot; &quot;[inetsrv32]ModSecurityIIS.dll&quot; &quot;[inetsrv32]pcre.dll&quot; &quot;[inetsrv32]zlib1.dll&quot; &quot;[inetsrv32]fuzzy.dll&quot;" WorkingDirectory="INSTALLFOLDER" />
                         <?endif ?>
                     </Component>
                 </Directory>
@@ -366,6 +369,7 @@
                 <File Id="_64_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\amd64\ModSecurityIIS.dll" />
                 <File Id="_64_PCRE" Name="pcre.dll" Source="Release\amd64\pcre.dll" />
                 <File Id="_64_ZLIB1" Name="zlib1.dll" Source="Release\amd64\zlib1.dll" />
+                <File Id="_64_FUZZY" Name="fuzzy.dll" Source="Release\amd64\fuzzy.dll" />
             </Component>
         </DirectoryRef>
         <DirectoryRef Id="inetsrv32">
@@ -381,6 +385,7 @@
                 <File Id="_32_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\x86\ModSecurityIIS.dll" />
                 <File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
                 <File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
+                <File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
             </Component>
         </DirectoryRef>
         <DirectoryRef Id="SystemFolderConfigSchema32">
@@ -407,6 +412,7 @@
                 <File Id="_32_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\x86\ModSecurityIIS.dll" />
                 <File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
                 <File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
+                <File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
             </Component>
         </DirectoryRef>
         <DirectoryRef Id="SystemFolderConfigSchema32">