Add support for building on VC 2005, and remove support for old MSVC.

5 files changed, 433 insertions, 292 deletions

diff --git a/ckcapi.c b/ckcapi.c
index 1a398b3..d56d910 100644
--- a/ckcapi.c
+++ b/ckcapi.c
@@ -23,6 +23,9 @@
 
 #include "ckcapi.h"
 
+/* Warns about all the raw string usage in this file */
+#pragma warning (disable : 4996)
+
 /* -------------------------------------------------------------------
  * GLOBALS / DEFINES 
  */
@@ -47,18 +50,24 @@ static HANDLE global_mutex = NULL;
  * MODULE GLOBAL FUNCTIONS
  */
 
+#define LINE 1024
+
 void 
 ckcapi_debug(const char* msg, ...)
 {
-	char buf[1024];
+	char buf[LINE];
 	va_list va;
+	size_t len;
 
 	va_start(va, msg);
 	_vsnprintf(buf, 1024, msg, va);
 	va_end(va);
 
-	strncat(buf, "\n", 1024);
-	buf[1024 - 1] = 0;
+	buf[LINE - 1] = 0;
+	len = strlen (buf);
+
+	strncpy(buf + len, "\n", 1024 - len);
+	buf[LINE - 1] = 0;
 	OutputDebugStringA(buf);
 }
 
@@ -262,7 +271,7 @@ CC_C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR slot_list, CK_ULONG_PTR c
 		
 	*count = n_tokens;
 	for(i = 0; i < n_tokens; ++i)
-		slot_list[i] = i;
+		slot_list[i] = ckcapi_token_get_slot_id (i);
 	RETURN(CKR_OK);
 }
 
diff --git a/ckcapi.dsw b/ckcapi.dsw
deleted file mode 100644
index a6cb239..0000000
--- a/ckcapi.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "cryptoki_capi"=".\ckcapi.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "sandbox"=".\sandbox\sandbox.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/ckcapi.mak b/ckcapi.mak
deleted file mode 100644
index c55eefc..0000000
--- a/ckcapi.mak
+++ /dev/null
@@ -1,247 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on ckcapi.dsp

-!IF "$(CFG)" == ""

-CFG=cryptoki_capi - Win32 Debug

-!MESSAGE No configuration specified. Defaulting to cryptoki_capi - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "cryptoki_capi - Win32 Release" && "$(CFG)" != "cryptoki_capi - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "ckcapi.mak" CFG="cryptoki_capi - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "cryptoki_capi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "cryptoki_capi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-

-!IF  "$(CFG)" == "cryptoki_capi - Win32 Release"

-

-OUTDIR=.\Release

-INTDIR=.\Release

-# Begin Custom Macros

-OutDir=.\Release

-# End Custom Macros

-

-ALL : "$(OUTDIR)\ckcapi.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\ckcapi-builtin.obj"

-	-@erase "$(INTDIR)\ckcapi-cert.obj"

-	-@erase "$(INTDIR)\ckcapi-object.obj"

-	-@erase "$(INTDIR)\ckcapi-session.obj"

-	-@erase "$(INTDIR)\ckcapi-trust.obj"

-	-@erase "$(INTDIR)\ckcapi-util.obj"

-	-@erase "$(INTDIR)\ckcapi.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(OUTDIR)\ckcapi.dll"

-	-@erase "$(OUTDIR)\ckcapi.exp"

-	-@erase "$(OUTDIR)\ckcapi.lib"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTOKI_CAPI_EXPORTS" /Fp"$(INTDIR)\ckcapi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-MTL=midl.exe

-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ckcapi.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib crypt32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\ckcapi.pdb" /machine:I386 /out:"$(OUTDIR)\ckcapi.dll" /implib:"$(OUTDIR)\ckcapi.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\ckcapi-builtin.obj" \

-	"$(INTDIR)\ckcapi-cert.obj" \

-	"$(INTDIR)\ckcapi-object.obj" \

-	"$(INTDIR)\ckcapi-session.obj" \

-	"$(INTDIR)\ckcapi-trust.obj" \

-	"$(INTDIR)\ckcapi-util.obj" \

-	"$(INTDIR)\ckcapi.obj"

-

-"$(OUTDIR)\ckcapi.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "cryptoki_capi - Win32 Debug"

-

-OUTDIR=.\Debug

-INTDIR=.\Debug

-# Begin Custom Macros

-OutDir=.\Debug

-# End Custom Macros

-

-ALL : "$(OUTDIR)\ckcapi.dll"

-

-

-CLEAN :

-	-@erase "$(INTDIR)\ckcapi-builtin.obj"

-	-@erase "$(INTDIR)\ckcapi-cert.obj"

-	-@erase "$(INTDIR)\ckcapi-object.obj"

-	-@erase "$(INTDIR)\ckcapi-session.obj"

-	-@erase "$(INTDIR)\ckcapi-trust.obj"

-	-@erase "$(INTDIR)\ckcapi-util.obj"

-	-@erase "$(INTDIR)\ckcapi.obj"

-	-@erase "$(INTDIR)\vc60.idb"

-	-@erase "$(INTDIR)\vc60.pdb"

-	-@erase "$(OUTDIR)\ckcapi.dll"

-	-@erase "$(OUTDIR)\ckcapi.exp"

-	-@erase "$(OUTDIR)\ckcapi.ilk"

-	-@erase "$(OUTDIR)\ckcapi.lib"

-	-@erase "$(OUTDIR)\ckcapi.pdb"

-

-"$(OUTDIR)" :

-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

-

-CPP=cl.exe

-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CRYPTOKI_CAPI_EXPORTS" /Fp"$(INTDIR)\ckcapi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 

-

-.c{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.obj::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.c{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cpp{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-.cxx{$(INTDIR)}.sbr::

-   $(CPP) @<<

-   $(CPP_PROJ) $< 

-<<

-

-MTL=midl.exe

-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 

-RSC=rc.exe

-BSC32=bscmake.exe

-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ckcapi.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib crypt32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\ckcapi.pdb" /debug /machine:I386 /out:"$(OUTDIR)\ckcapi.dll" /implib:"$(OUTDIR)\ckcapi.lib" /pdbtype:sept 

-LINK32_OBJS= \

-	"$(INTDIR)\ckcapi-builtin.obj" \

-	"$(INTDIR)\ckcapi-cert.obj" \

-	"$(INTDIR)\ckcapi-object.obj" \

-	"$(INTDIR)\ckcapi-session.obj" \

-	"$(INTDIR)\ckcapi-trust.obj" \

-	"$(INTDIR)\ckcapi-util.obj" \

-	"$(INTDIR)\ckcapi.obj"

-

-"$(OUTDIR)\ckcapi.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-

-!IF "$(NO_EXTERNAL_DEPS)" != "1"

-!IF EXISTS("ckcapi.dep")

-!INCLUDE "ckcapi.dep"

-!ELSE 

-!MESSAGE Warning: cannot find "ckcapi.dep"

-!ENDIF 

-!ENDIF 

-

-

-!IF "$(CFG)" == "cryptoki_capi - Win32 Release" || "$(CFG)" == "cryptoki_capi - Win32 Debug"

-SOURCE=".\ckcapi-builtin.c"

-

-"$(INTDIR)\ckcapi-builtin.obj" : $(SOURCE) "$(INTDIR)"

-

-

-SOURCE=".\ckcapi-cert.c"

-

-"$(INTDIR)\ckcapi-cert.obj" : $(SOURCE) "$(INTDIR)"

-

-

-SOURCE=".\ckcapi-object.c"

-

-"$(INTDIR)\ckcapi-object.obj" : $(SOURCE) "$(INTDIR)"

-

-

-SOURCE=".\ckcapi-session.c"

-

-"$(INTDIR)\ckcapi-session.obj" : $(SOURCE) "$(INTDIR)"

-

-

-SOURCE=".\ckcapi-trust.c"

-

-"$(INTDIR)\ckcapi-trust.obj" : $(SOURCE) "$(INTDIR)"

-

-

-SOURCE=".\ckcapi-util.c"

-

-"$(INTDIR)\ckcapi-util.obj" : $(SOURCE) "$(INTDIR)"

-

-

-SOURCE=.\ckcapi.c

-

-"$(INTDIR)\ckcapi.obj" : $(SOURCE) "$(INTDIR)"

-

-

-

-!ENDIF 

-

diff --git a/ckcapi.sln b/ckcapi.sln
new file mode 100644
index 0000000..e4469b0
--- /dev/null
+++ b/ckcapi.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptoki_capi", "ckcapi.vcproj", "{5FC3E27C-F74F-41ED-8BE9-8A586AFC059A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5FC3E27C-F74F-41ED-8BE9-8A586AFC059A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FC3E27C-F74F-41ED-8BE9-8A586AFC059A}.Debug|Win32.Build.0 = Debug|Win32
+		{5FC3E27C-F74F-41ED-8BE9-8A586AFC059A}.Release|Win32.ActiveCfg = Release|Win32
+		{5FC3E27C-F74F-41ED-8BE9-8A586AFC059A}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ckcapi.vcproj b/ckcapi.vcproj
new file mode 100644
index 0000000..0dd6a40
--- /dev/null
+++ b/ckcapi.vcproj
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ckcapi"
+	ProjectGUID="{5FC3E27C-F74F-41ED-8BE9-8A586AFC059A}"
+	RootNamespace="ckcapi"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/ckcapi.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPTOKI_CAPI_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\Debug/ckcapi.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib crypt32.lib"
+				OutputFile=".\Debug/ckcapi.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/ckcapi.pdb"
+				ImportLibrary=".\Debug/ckcapi.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/ckcapi.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/ckcapi.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPTOKI_CAPI_EXPORTS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/ckcapi.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib crypt32.lib"
+				OutputFile=".\Release/ckcapi.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/ckcapi.pdb"
+				ImportLibrary=".\Release/ckcapi.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/ckcapi.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="ckcapi-builtin.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi-cert.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi-object.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi-session.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi-token.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi-trust.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi-util.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="ckcapi.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="ckcapi-util.h"
+				>
+			</File>
+			<File
+				RelativePath="ckcapi.h"
+				>
+			</File>
+			<File
+				RelativePath="pkcs11\pkcs11.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>