win32: add sigtool

16 years ago · 8f5bb092f8
parent 9a045601fc
commit 8f5bb092f8
9 changed files with 435 additions and 143 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Tue Mar 16 04:11:02 CET 2010 (acab)
+-----------------------------------
+ * win32: add sigtool upon request from 3rd party sigmakers
+
 Wed Mar 10 20:04:46 CET 2010 (tk)
 ---------------------------------
 * V 0.96rc1
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@ -27,7 +27,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <zlib.h>
 #include <time.h>
 #include <locale.h>
--- a/sigtool/vba.c
+++ b/sigtool/vba.c
@ -24,7 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
--- a/win32/ClamAV.sln
+++ b/win32/ClamAV.sln
@ -56,6 +56,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamdscan", "clamdscan.vcpr
 		{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigtool", "sigtool.vcproj", "{38B89BC0-6C00-4ABB-A179-24FEE81D1890}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@ -118,6 +123,10 @@ Global
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.Build.0 = Debug|Win32
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.ActiveCfg = Release|Win32
 		{9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.Build.0 = Release|Win32
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Debug|Win32.ActiveCfg = Debug|Win32
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Debug|Win32.Build.0 = Debug|Win32
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Release|Win32.ActiveCfg = Release|Win32
+		{38B89BC0-6C00-4ABB-A179-24FEE81D1890}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/win32/clamav-config.h
+++ b/win32/clamav-config.h
@ -493,7 +493,7 @@
 /* #undef USE_SYSLOG */

 /* Version number of package */
-#define VERSION "devel-clamav-0.96rc1-6-gaa745db"
+#define VERSION "devel-clamav-0.96rc1-8-g9a04560"

 /* Version suffix for package */
 #define VERSION_SUFFIX ""
--- a/win32/libclamav.def
+++ b/win32/libclamav.def
@ -1,150 +1,192 @@
 LIBRARY libclamav
-; cl_stuff - should be exported as is
-EXPORTS cl_debug
-EXPORTS cl_load
-EXPORTS cl_engine_compile
-EXPORTS cl_engine_set_num
-EXPORTS cl_engine_set_str
-EXPORTS cl_engine_free
-EXPORTS cl_engine_new
-EXPORTS cl_engine_settings_copy
-EXPORTS cl_engine_settings_free
-EXPORTS cl_engine_settings_apply
-EXPORTS cl_engine_get_num
-EXPORTS cl_strerror
-EXPORTS cl_init
-EXPORTS cl_retdbdir
-EXPORTS cl_scandesc
-EXPORTS cl_scanfile
-EXPORTS cl_cvdfree
-EXPORTS cl_cvdhead
-EXPORTS cl_retflevel
-EXPORTS cl_cvdparse
-EXPORTS cl_cvdverify
-EXPORTS cl_retver
-EXPORTS cl_engine_addref
-EXPORTS cl_statinidir
-EXPORTS cl_statchkdir
-EXPORTS cl_statfree
-EXPORTS cl_countsigs
+; cl_functions
+; ------------
+;
+; These APIs are stable and can be safey linked by name or ordinal
+; Note: add new exports to the bottom of this block!

-; cli_stuff - should be mangled or exported by ordinal only
-EXPORTS cli_gentemp
-EXPORTS cli_gentempfd
-EXPORTS cli_gettmpdir
-EXPORTS cli_regcomp
-EXPORTS cli_regexec
-EXPORTS cli_regfree
-EXPORTS cli_ctime
-EXPORTS cli_rmdirs
-EXPORTS cli_isnumber
-EXPORTS cli_strtok
-EXPORTS cli_cvdunpack
-EXPORTS cli_chomp
-EXPORTS cli_strtokenize
-EXPORTS cli_versig2
-EXPORTS cli_strerror
-EXPORTS cli_rndnum
-EXPORTS cli_unlink
-EXPORTS cli_writen
-EXPORTS cli_ftw
-EXPORTS have_rar
-EXPORTS have_clamjit
+EXPORTS cl_countsigs @1
+EXPORTS cl_cvdfree @2
+EXPORTS cl_cvdhead @3
+EXPORTS cl_cvdparse @4
+EXPORTS cl_cvdverify @5
+EXPORTS cl_debug @6
+EXPORTS cl_engine_addref @7
+EXPORTS cl_engine_compile @8
+EXPORTS cl_engine_free @9
+EXPORTS cl_engine_get_num @10
+EXPORTS cl_engine_new @11
+EXPORTS cl_engine_set_num @12
+EXPORTS cl_engine_set_str @13
+EXPORTS cl_engine_settings_apply @14
+EXPORTS cl_engine_settings_copy @15
+EXPORTS cl_engine_settings_free @16
+EXPORTS cl_init @17
+EXPORTS cl_load @18
+EXPORTS cl_retdbdir @19
+EXPORTS cl_retflevel @20
+EXPORTS cl_retver @21
+EXPORTS cl_scandesc @22
+EXPORTS cl_scanfile @23
+EXPORTS cl_statchkdir @24
+EXPORTS cl_statfree @25
+EXPORTS cl_statinidir @26
+EXPORTS cl_strerror @27

-EXPORTS cli_bytecode_done
-EXPORTS cli_bytecode_destroy
-EXPORTS cli_bytecode_context_destroy
-EXPORTS cli_bytecode_context_getresult_int
-EXPORTS cli_bytecode_run
-EXPORTS funmap
-EXPORTS cli_bytecode_context_setfile
-EXPORTS fmap
-EXPORTS cli_bytecode_context_setparam_int
-EXPORTS cli_bytecode_context_setfuncid
-EXPORTS cli_bytecode_context_set_trace
-EXPORTS cli_bytecode_context_alloc
-EXPORTS cli_bytecode_prepare
-EXPORTS cli_bytecode_load
-EXPORTS cli_bytecode_init
-EXPORTS cli_bytecode_debug
-EXPORTS cli_bytecode_debug_printsrc
-EXPORTS cli_bytecode_printversion
-EXPORTS cli_bytecode_describe

-; shared stuff - to be either double compiled into the tools or treated like cli_xxx
-EXPORTS opendir
-EXPORTS readdir
-EXPORTS closedir
-EXPORTS safe_open
-EXPORTS snprintf
-EXPORTS mp_init
-EXPORTS mp_read_radix
-EXPORTS mp_clear
-EXPORTS sha256_init
-EXPORTS sha256_update
-EXPORTS sha256_final
-EXPORTS gzopen
-EXPORTS gzgets
-EXPORTS gzdopen
-EXPORTS gzclose
-EXPORTS gzwrite
+; path variables
+; --------------
+;
+; These variables (char *) are for primary use by the ClamAV tools
+; They are however stable and safe to link by 3rd parties

-EXPORTS optget
-EXPORTS optparse
-EXPORTS optfree
-EXPORTS clam_options DATA
+EXPORTS DATADIR @1000 DATA
+EXPORTS CONFDIR @1001 DATA
+EXPORTS CONFDIR_CLAMD @1002 DATA
+EXPORTS CONFDIR_FRESHCLAM @1003 DATA
+EXPORTS CONFDIR_MILTER @1004 DATA

-EXPORTS DATADIR DATA
-EXPORTS CONFDIR DATA
-EXPORTS CONFDIR_CLAMD DATA
-EXPORTS CONFDIR_FRESHCLAM DATA
-EXPORTS CONFDIR_MILTER DATA

-; winsock - bridging for now
-EXPORTS htonl
-EXPORTS htons
-EXPORTS ntohl
-EXPORTS ntohs
-EXPORTS __WSAFDIsSet
-EXPORTS gettimeofday
-EXPORTS pthread_mutex_lock
-EXPORTS pthread_mutex_unlock
-EXPORTS pthread_mutex_destroy
-EXPORTS pthread_once
-EXPORTS pthread_getspecific
-EXPORTS pthread_setspecific
-EXPORTS pthread_create
-EXPORTS pthread_cond_timedwait
-EXPORTS pthread_cond_init
-EXPORTS pthread_cond_broadcast
-EXPORTS pthread_cond_signal
-EXPORTS pthread_cond_destroy
-EXPORTS pthread_join
-EXPORTS pthread_key_create
-EXPORTS pthread_cond_wait
-EXPORTS pthread_attr_init
-EXPORTS pthread_attr_setdetachstate
-EXPORTS pthread_attr_destroy
-EXPORTS pthread_mutex_init
+; PRIVATE SYMBOLS!!!
+; ------------------
+; All the following symbols are private and therefore only exported by
+; ordinals. The API and ABI is guaranteed to break frequently and
+; ordinals will be randomized at each and every minor release.
+; LINK AT YOUR OWN RISK!

-EXPORTS w32_socket
-EXPORTS w32_getsockopt
-EXPORTS w32_setsockopt
-EXPORTS w32_bind
-EXPORTS w32_listen
-EXPORTS w32_accept
-EXPORTS w32_connect
-EXPORTS w32_shutdown
-EXPORTS w32_send
-EXPORTS w32_recv
-EXPORTS w32_closesocket
-EXPORTS w32_getservbyname
-EXPORTS w32_getaddrinfo
-EXPORTS w32_freeaddrinfo
-EXPORTS w32_inet_ntop
-EXPORTS w32_gethostbyname
-EXPORTS w32_select
-EXPORTS poll_with_event
-EXPORTS w32_stat
-EXPORTS w32_strerror
-EXPORTS w32_strerror_r
+; cli_xxxxx and other internal internal symbols required by the tools
+EXPORTS cli_gentemp @44203 NONAME
+EXPORTS cli_gentempfd @44204 NONAME
+EXPORTS cli_gettmpdir @44205 NONAME
+EXPORTS cli_regcomp @44206 NONAME
+EXPORTS cli_regexec @44207 NONAME
+EXPORTS cli_regfree @44208 NONAME
+EXPORTS cli_ctime @44209 NONAME
+EXPORTS cli_rmdirs @44210 NONAME
+EXPORTS cli_isnumber @44211 NONAME
+EXPORTS cli_strtok @44212 NONAME
+EXPORTS cli_cvdunpack @44213 NONAME
+EXPORTS cli_chomp @44214 NONAME
+EXPORTS cli_strtokenize @44215 NONAME
+EXPORTS cli_versig2 @44216 NONAME
+EXPORTS cli_strerror @44217 NONAME
+EXPORTS cli_rndnum @44218 NONAME
+EXPORTS cli_unlink @44219 NONAME
+EXPORTS cli_writen @44220 NONAME
+EXPORTS cli_ftw @44221 NONAME
+EXPORTS have_rar @44222 NONAME
+EXPORTS have_clamjit @44223 NONAME
+EXPORTS cli_bytecode_done @44224 NONAME
+EXPORTS cli_bytecode_destroy @44225 NONAME
+EXPORTS cli_bytecode_context_destroy @44226 NONAME
+EXPORTS cli_bytecode_context_getresult_int @44227 NONAME
+EXPORTS cli_bytecode_run @44228 NONAME
+EXPORTS funmap @44229 NONAME
+EXPORTS cli_bytecode_context_setfile @44230 NONAME
+EXPORTS fmap @44231 NONAME
+EXPORTS cli_bytecode_context_setparam_int @44232 NONAME
+EXPORTS cli_bytecode_context_setfuncid @44233 NONAME
+EXPORTS cli_bytecode_context_set_trace @44234 NONAME
+EXPORTS cli_bytecode_context_alloc @44235 NONAME
+EXPORTS cli_bytecode_prepare @44236 NONAME
+EXPORTS cli_bytecode_load @44237 NONAME
+EXPORTS cli_bytecode_init @44238 NONAME
+EXPORTS cli_bytecode_debug @44239 NONAME
+EXPORTS cli_bytecode_debug_printsrc @44240 NONAME
+EXPORTS cli_bytecode_printversion @44241 NONAME
+EXPORTS cli_bytecode_describe @44242 NONAME
+EXPORTS cli_malloc @44243 NONAME
+EXPORTS cli_wm_decrypt_macro @44244 NONAME
+EXPORTS cli_wm_readdir @44245 NONAME
+EXPORTS cli_ppt_vba_read @44246 NONAME
+EXPORTS cli_vba_inflate @44247 NONAME
+EXPORTS cli_vba_readdir @44248 NONAME
+EXPORTS uniq_get @44249 NONAME
+EXPORTS cli_ole2_extract @44250 NONAME
+EXPORTS cli_calloc @44251 NONAME
+EXPORTS cli_str2hex @44252 NONAME
+EXPORTS cli_md5stream @44253 NONAME
+EXPORTS cli_md5file @44254 NONAME
+EXPORTS html_normalise_map @44255 NONAME
+EXPORTS cli_utf16toascii @44256 NONAME
+EXPORTS cli_strbcasestr @44257 NONAME
+EXPORTS cli_ac_chklsig @44258 NONAME
+EXPORTS cli_parse_add @44259 NONAME
+EXPORTS cli_initroots @44260 NONAME
+EXPORTS cli_hex2str @44261 NONAME
+EXPORTS cli_hex2ui @44262 NONAME
+
+; compatibility layer, tommath, zlib
+EXPORTS gettimeofday @44263 NONAME
+EXPORTS opendir @44264 NONAME
+EXPORTS readdir @44265 NONAME
+EXPORTS closedir @44266 NONAME
+EXPORTS safe_open @44267 NONAME
+EXPORTS snprintf @44268 NONAME
+EXPORTS mp_init @44269 NONAME
+EXPORTS mp_read_radix @44270 NONAME
+EXPORTS mp_clear @44271 NONAME
+EXPORTS sha256_init @44272 NONAME
+EXPORTS sha256_update @44273 NONAME
+EXPORTS sha256_final @44274 NONAME
+EXPORTS optget @44275 NONAME
+EXPORTS optparse @44276 NONAME
+EXPORTS optfree @44277 NONAME
+EXPORTS clam_options @44278 NONAME DATA
+
+; zlib
+EXPORTS gzopen @44279 NONAME
+EXPORTS gzgets @44280 NONAME
+EXPORTS gzdopen @44281 NONAME
+EXPORTS gzclose @44282 NONAME
+EXPORTS gzwrite @44283 NONAME
+
+; pthreads
+EXPORTS pthread_mutex_lock @44284 NONAME
+EXPORTS pthread_mutex_unlock @44285 NONAME
+EXPORTS pthread_mutex_destroy @44286 NONAME
+EXPORTS pthread_once @44287 NONAME
+EXPORTS pthread_getspecific @44288 NONAME
+EXPORTS pthread_setspecific @44289 NONAME
+EXPORTS pthread_create @44290 NONAME
+EXPORTS pthread_cond_timedwait @44291 NONAME
+EXPORTS pthread_cond_init @44292 NONAME
+EXPORTS pthread_cond_broadcast @44293 NONAME
+EXPORTS pthread_cond_signal @44294 NONAME
+EXPORTS pthread_cond_destroy @44295 NONAME
+EXPORTS pthread_join @44296 NONAME
+EXPORTS pthread_key_create @44297 NONAME
+EXPORTS pthread_cond_wait @44298 NONAME
+EXPORTS pthread_attr_init @44299 NONAME
+EXPORTS pthread_attr_setdetachstate @44300 NONAME
+EXPORTS pthread_attr_destroy @44301 NONAME
+EXPORTS pthread_mutex_init @44302 NONAME
+
+; winsock bridge and compatibility functions
+EXPORTS htonl @44303 NONAME
+EXPORTS htons @44304 NONAME
+EXPORTS ntohl @44305 NONAME
+EXPORTS ntohs @44306 NONAME
+EXPORTS __WSAFDIsSet @44307 NONAME
+EXPORTS w32_socket @44308 NONAME
+EXPORTS w32_getsockopt @44309 NONAME
+EXPORTS w32_setsockopt @44310 NONAME
+EXPORTS w32_bind @44311 NONAME
+EXPORTS w32_listen @44312 NONAME
+EXPORTS w32_accept @44313 NONAME
+EXPORTS w32_connect @44314 NONAME
+EXPORTS w32_shutdown @44315 NONAME
+EXPORTS w32_send @44316 NONAME
+EXPORTS w32_recv @44317 NONAME
+EXPORTS w32_closesocket @44318 NONAME
+EXPORTS w32_getservbyname @44319 NONAME
+EXPORTS w32_getaddrinfo @44320 NONAME
+EXPORTS w32_freeaddrinfo @44321 NONAME
+EXPORTS w32_inet_ntop @44322 NONAME
+EXPORTS w32_gethostbyname @44323 NONAME
+EXPORTS w32_select @44324 NONAME
+EXPORTS poll_with_event @44325 NONAME
+EXPORTS w32_stat @44326 NONAME
+EXPORTS w32_strerror @44327 NONAME
+EXPORTS w32_strerror_r @44328 NONAME
+EXPORTS inet_addr @44329 NONAME
--- a/win32/res/sigtool.rc
+++ b/win32/res/sigtool.rc
@ -0,0 +1,6 @@
+#define RES_FNAME "sigtool.exe"
+#define RES_NAME "sigtool"
+#define RES_FDESC "ClamAV - sigtool"
+#include "common.rc"
+
+1337 ICON "clam.ico"
--- a/win32/sigtool.vcproj
+++ b/win32/sigtool.vcproj
@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	Keyword="Win32Proj"
+	Name="sigtool"
+	ProjectGUID="{38B89BC0-6C00-4ABB-A179-24FEE81D1890}"
+	ProjectType="Visual C++"
+	RootNamespace="sigtool"
+	TargetFrameworkVersion="196613"
+	Version="9,00"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			CharacterSet="2"
+			ConfigurationType="1"
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
+				BasicRuntimeChecks="3"
+				CompileAs="1"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+				MinimalRebuild="true"
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				GenerateDebugInformation="true"
+				LinkIncremental="1"
+				Name="VCLinkerTool"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			CharacterSet="2"
+			ConfigurationType="1"
+			IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)..\libclamav&quot;;&quot;$(SolutionDir)compat&quot;;&quot;$(SolutionDir)3rdparty\zlib&quot;;&quot;$(SolutionDir)3rdparty\pthreads&quot;;&quot;$(SolutionDir)3rdparty\bzip2&quot;;&quot;$(SolutionDir)..&quot;"
+				CompileAs="1"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+				EnableFunctionLevelLinking="true"
+				EnableIntrinsicFunctions="true"
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				EnableCOMDATFolding="2"
+				GenerateDebugInformation="true"
+				LinkIncremental="1"
+				Name="VCLinkerTool"
+				OptimizeReferences="2"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Name="Source Files"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\sigtool\sigtool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\sigtool\vba.c"
+				>
+			</File>
+			<Filter
+				Name="shared"
+				>
+				<File
+					RelativePath="..\shared\cdiff.c"
+					>
+				</File>
+				<File
+					RelativePath="..\shared\misc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\shared\output.c"
+					>
+				</File>
+				<File
+					RelativePath="..\shared\tar.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+		</Filter>
+		<Filter
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			Name="Resource Files"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\res\sigtool.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/win32/update-win32.pl
+++ b/win32/update-win32.pl
@ -244,6 +244,8 @@ my @PROJECTS = (
    # LLVMjit #
    {makefile => 'libclamav/c++', sections => ['libllvmjit'], output => 'win32/LLVMjit.vcproj'},

+    # sigtool #
+    {makefile => 'sigtool', sections => ['sigtool'], output => 'win32/sigtool.vcproj', makefile_only => '(optparser\\.c|getopt\\.c)$'},

    );